Merge "Always call tieProfileLockIfNecessary() under mSpManager lock" into main (daa8f946) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/flags/flags.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,16 @@ flag {
		bug: "323001115"
		}

		flag {
		name: "fix_race_condition_in_tie_profile_lock"
		namespace: "enterprise"
		description: "Fix race condition in tieProfileLockIfNecessary()"
		bug: "355905501"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "quiet_mode_credential_bug_fix"
		namespace: "enterprise"

+15 −3

Original line number	Diff line number	Diff line
		@@ -889,10 +889,16 @@ public class LockSettingsService extends ILockSettings.Stub {
		// Hide notification first, as tie profile lock takes time
		hideEncryptionNotification(new UserHandle(userId));

		if (android.app.admin.flags.Flags.fixRaceConditionInTieProfileLock()) {
		synchronized (mSpManager) {
		tieProfileLockIfNecessary(userId, LockscreenCredential.createNone());
		}
		} else {
		if (isCredentialSharableWithParent(userId)) {
		tieProfileLockIfNecessary(userId, LockscreenCredential.createNone());
		}
		}
		}
		});
		}

		@@ -1287,8 +1293,14 @@ public class LockSettingsService extends ILockSettings.Stub {
		mStorage.removeChildProfileLock(userId);
		removeKeystoreProfileKey(userId);
		} else {
		if (android.app.admin.flags.Flags.fixRaceConditionInTieProfileLock()) {
		synchronized (mSpManager) {
		tieProfileLockIfNecessary(userId, profileUserPassword);
		}
		} else {
		tieProfileLockIfNecessary(userId, profileUserPassword);
		}
		}
		} catch (IllegalStateException e) {
		setBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, old, userId);
		throw e;