Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf63ea8a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[locksettings] system_server should not call non forUser Settings.Secure.get* methods"

parents 13b0184e b1038945

services/core/java/com/android/server/locksettings/LockSettingsService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }