Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev

Browse Source 
am: 042a68ae32

* commit '042a68ae3297db27c4bd6aca7f1c39001261b85e':
  Attempt to fix bug where OwnerInfo gets lost.
This commit is contained in:
Jim Miller
2016-03-03 01:17:35 +00:00
committed by android-build-merger
parent 477e1c6124 042a68ae32
commit f0060709ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -345,9 +345,9 @@ public class LockSettingsService extends ILockSettings.Stub {
final int userId = users.get(user).id; final int userId = users.get(user).id;
final String OWNER_INFO = Secure.LOCK_SCREEN_OWNER_INFO; final String OWNER_INFO = Secure.LOCK_SCREEN_OWNER_INFO;
String ownerInfo = Settings.Secure.getStringForUser(cr, OWNER_INFO, userId); String ownerInfo = Settings.Secure.getStringForUser(cr, OWNER_INFO, userId);
if (ownerInfo != null) { if (!TextUtils.isEmpty(ownerInfo)) {
setString(OWNER_INFO, ownerInfo, userId); 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 // Migrate owner info enabled. Note there was a bug where older platforms only