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

New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.

Browse Source 
am: eb2e45369a

Change-Id: I64c1cc38bc38d9d0ee6214a64c6ddfaa57095ce0
This commit is contained in:
Greg Plesur
2016-11-03 20:23:24 +00:00
committed by android-build-merger
parent 10f3eda0fd eb2e45369a
commit a71a0b8da1
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -584,6 +584,20 @@ public class LockSettingsService extends ILockSettings.Stub {
Slog.e(TAG, "Unable to remove tied profile key", e);
}
}
boolean isWatch = mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_WATCH);
// Wear used to set DISABLE_LOCKSCREEN to 'true', but because Wear now allows accounts
// and device management the lockscreen must be re-enabled now for users that upgrade.
if (isWatch && getString("migrated_wear_lockscreen_disabled", null, 0) == null) {
final int userCount = users.size();
for (int i = 0; i < userCount; i++) {
int id = users.get(i).id;
setBoolean(LockPatternUtils.DISABLE_LOCKSCREEN_KEY, false, id);
}
setString("migrated_wear_lockscreen_disabled", "true", 0);
Slog.i(TAG, "Migrated lockscreen_disabled for Wear devices");
}
} catch (RemoteException re) {
Slog.e(TAG, "Unable to migrate old data", re);
}