diff options
| -rw-r--r-- | core/java/android/app/admin/flags/flags.aconfig | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/locksettings/LockSettingsService.java | 17 |
2 files changed, 4 insertions, 23 deletions
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index d9f886d41aa8..923d43968683 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -160,16 +160,6 @@ flag { } 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" description: "Guards a bugfix that ends the credential input flow if the managed user has not stopped." diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 3f915757f137..286238e7888c 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -451,6 +451,7 @@ public class LockSettingsService extends ILockSettings.Stub { * @param profileUserId profile user Id * @param profileUserPassword profile original password (when it has separated lock). */ + @GuardedBy("mSpManager") private void tieProfileLockIfNecessary(int profileUserId, LockscreenCredential profileUserPassword) { // Only for profiles that shares credential with parent @@ -909,14 +910,8 @@ 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()); - } + synchronized (mSpManager) { + tieProfileLockIfNecessary(userId, LockscreenCredential.createNone()); } } }); @@ -1380,11 +1375,7 @@ 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 { + synchronized (mSpManager) { tieProfileLockIfNecessary(userId, profileUserPassword); } } |