From 325c56741a4896741f3e3c5894c20ee55090a31b Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 1 Mar 2016 19:21:47 -0800 Subject: [PATCH] Attempt to fix bug where OwnerInfo gets lost. Bug 27419272 Change-Id: I2f938606c3155afd2fc31b5da640b7b74c397a14 --- .../core/java/com/android/server/LockSettingsService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index c318140ae7e8c..e442d0e5db438 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -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