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. am: eb2e45369a

Browse Source 
am: a71a0b8da1

Change-Id: I9a19eea21e008a9253ea7abbd854b21f4696548c
This commit is contained in:
Greg Plesur
2016-11-03 20:29:55 +00:00
committed by android-build-merger
parent af03cd3c5b a71a0b8da1
commit e44736a819
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); 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) { } catch (RemoteException re) {
Slog.e(TAG, "Unable to migrate old data", re); Slog.e(TAG, "Unable to migrate old data", re);
} }