Restore separate challenge state on error (1ed95cb0) · Commits · e / os / android_frameworks_base

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -955,13 +955,19 @@ public class LockSettingsService extends ILockSettings.Stub {
		@GuardedBy("mSeparateChallengeLock")
		private void setSeparateProfileChallengeEnabledLocked(@UserIdInt int userId, boolean enabled,
		String managedUserPassword) {
		final boolean old = getBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, false, userId);
		setBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, enabled, userId);
		try {
		if (enabled) {
		mStorage.removeChildProfileLock(userId);
		removeKeystoreProfileKey(userId);
		} else {
		tieManagedProfileLockIfNecessary(userId, managedUserPassword);
		}
		} catch (IllegalStateException e) {
		setBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, old, userId);
		throw e;
		}
		}

		private void notifySeparateProfileChallengeChanged(int userId) {