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

Commit 2b37a70a authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev am: 042a68ae 

am: f0060709

* commit 'f0060709':
  Attempt to fix bug where OwnerInfo gets lost.
parents e3810aac f0060709

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

+2 −2
Original line number Diff line number Diff line
@@ -345,9 +345,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
                    final int userId = users.get(user).id;

                    final String OWNER_INFO = Secure.LOCK_SCREEN_OWNER_INFO;

                    String ownerInfo = Settings.Secure.getStringForUser(cr, OWNER_INFO, userId);

                    if (ownerInfo != null) {

                    if (!TextUtils.isEmpty(ownerInfo)) {

                        setString(OWNER_INFO, ownerInfo, userId);

                        Settings.Secure.putStringForUser(cr, ownerInfo, "", userId);

                        Settings.Secure.putStringForUser(cr, OWNER_INFO, "", userId);

                    }



                    // Migrate owner info enabled.  Note there was a bug where older platforms only