Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dba021a authored by Shawn Willden's avatar Shawn Willden Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock caused by sending LSKF changed notification" into main

parents 0f957b13 02a82289

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

+4 −4
Original line number Diff line number Diff line
@@ -1870,9 +1870,10 @@ public class LockSettingsService extends ILockSettings.Stub { 
        }

    }



    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);

    }



    /**
@@ -3056,7 +3057,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
        setCurrentLskfBasedProtectorId(newProtectorId, userId);

        LockPatternUtils.invalidateCredentialTypeCache();

        synchronizeUnifiedChallengeForProfiles(userId, profilePasswords);

        sendMainUserCredentialChangedNotificationIfNeeded(userId);



        setUserPasswordMetrics(credential, userId);

        mUnifiedProfilePasswordCache.removePassword(userId);