From b10389457fb12d29d6872c2b36f0ac1616de584d Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Thu, 3 Sep 2020 15:37:09 -0700
Subject: [PATCH] [locksettings] system_server should not call non forUser
 Settings.Secure.get* methods

BUG: 166312046
Test: builds
Change-Id: I167b60c2d9b56f84fd4bd001b3bffdc76d275246
---
 .../com/android/server/locksettings/LockSettingsService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 26c3132167d30..dbc725ea93e87 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);
                 }