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

Commit 11bf41da authored by Haining Chen's avatar Haining Chen Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile am: a3e155e8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24270326



Change-Id: I422a45dd54538606c5c1d8d822e78af8e24e280f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d77298c a3e155e8

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

+12 −2
Original line number Original line Diff line number Diff line
@@ -2992,9 +2992,19 @@ public class LockSettingsService extends ILockSettings.Stub { 
        }

        }

        activateEscrowTokens(authToken, userId);

        activateEscrowTokens(authToken, userId);





        if (isProfileWithSeparatedLock(userId)) {

        if (isCredentialSharableWithParent(userId)) {

            if (getSeparateProfileChallengeEnabledInternal(userId)) {

                setDeviceUnlockedForUser(userId);

                setDeviceUnlockedForUser(userId);

            } else {

                // Here only clear StrongAuthFlags for a profile that has a unified challenge.

                // StrongAuth for a profile with a separate challenge is handled differently and

                // is cleared after the user successfully confirms the separate challenge to enter

                // the profile. StrongAuth for the full user (e.g. userId 0) is also handled

                // separately by Keyguard.

                mStrongAuth.reportUnlock(userId);

            }

        }

        }



        mStrongAuth.reportSuccessfulStrongAuthUnlock(userId);

        mStrongAuth.reportSuccessfulStrongAuthUnlock(userId);





        onAuthTokenKnownForUser(userId, authToken);

        onAuthTokenKnownForUser(userId, authToken);