summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2020-09-03 15:37:09 -0700
committer Songchun Fan <schfan@google.com> 2020-09-03 23:01:41 +0000
commitb10389457fb12d29d6872c2b36f0ac1616de584d (patch)
tree4b0afb223057757b132e20d165b938db568c3a7f
parent4743509c7e05eacda785bebe9f4226a39ec945be (diff)
[locksettings] system_server should not call non forUser Settings.Secure.get* methods
BUG: 166312046 Test: builds Change-Id: I167b60c2d9b56f84fd4bd001b3bffdc76d275246
-rw-r--r--services/core/java/com/android/server/locksettings/LockSettingsService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 26c3132167d3..dbc725ea93e8 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -837,7 +837,7 @@ public class LockSettingsService extends ILockSettings.Stub {
if (getString("migrated", null, 0) == null) {
final ContentResolver cr = mContext.getContentResolver();
for (String validSetting : VALID_SETTINGS) {
- String value = Settings.Secure.getString(cr, validSetting);
+ String value = Settings.Secure.getStringForUser(cr, validSetting, cr.getUserId());
if (value != null) {
setString(validSetting, value, 0);
}