commit 02a82289ea60f2676e78e560113ed878036e79c1
author Shawn Willden <swillden@google.com> Wed Feb 28 13:36:33 2024 -0700
committer Shawn Willden <swillden@google.com> Wed Feb 28 13:36:33 2024 -0700
tree e4051249c8942fe8243a6f7b9c9527a24eac17ba
parent 5174adcc08bcc5ab6ecfb3d9c02f2786e05a387c

Fix deadlock caused by sending LSKF changed notification

Bug: 326363560
Test: atest com.android.cts.devicepolicy.ManagedProfilePasswordTest#testUnlockWorkProfile_deviceWidePassword
Change-Id: I710249c1153f8758d0e250a701f6966d90a53357

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

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 9a76ebd..77da69bf 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -1875,9 +1875,10 @@
         }
     }
 
-    private void onPostPasswordChanged(LockscreenCredential newCredential, int userHandle) {
-        updatePasswordHistory(newCredential, userHandle);
-        mContext.getSystemService(TrustManager.class).reportEnabledTrustAgentsChanged(userHandle);
+    private void onPostPasswordChanged(LockscreenCredential newCredential, int userId) {
+        updatePasswordHistory(newCredential, userId);
+        mContext.getSystemService(TrustManager.class).reportEnabledTrustAgentsChanged(userId);
+        sendMainUserCredentialChangedNotificationIfNeeded(userId);
     }
 
     /**
@@ -3062,7 +3063,6 @@
         setCurrentLskfBasedProtectorId(newProtectorId, userId);
         LockPatternUtils.invalidateCredentialTypeCache();
         synchronizeUnifiedChallengeForProfiles(userId, profilePasswords);
-        sendMainUserCredentialChangedNotificationIfNeeded(userId);
 
         setUserPasswordMetrics(credential, userId);
         mUnifiedProfilePasswordCache.removePassword(userId);