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

Commit 5885caad authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag guard additional reads of mGoingAwayRequestedForUserId, since this... 

Merge "Flag guard additional reads of mGoingAwayRequestedForUserId, since this value is not set with the refactor enabled." into main
parents 5382583e 99e1677e

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −2
Original line number Diff line number Diff line
@@ -3249,7 +3249,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime

                + " fadeoutDuration=" + fadeoutDuration);

        int currentUserId = mSelectedUserInteractor.getSelectedUserId();

        if (mGoingAwayRequestedForUserId != currentUserId) {

        if (!KeyguardWmStateRefactor.isEnabled() && mGoingAwayRequestedForUserId != currentUserId) {

            Log.e(TAG, "Not executing handleStartKeyguardExitAnimationInner() due to userId "

                    + "mismatch. Requested: " + mGoingAwayRequestedForUserId + ", current: "

                    + currentUserId);
@@ -3516,7 +3516,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
     * app transition before finishing the current RemoteAnimation, or the keyguard being re-shown).

     */

    private void handleCancelKeyguardExitAnimation() {

        if (mGoingAwayRequestedForUserId != mSelectedUserInteractor.getSelectedUserId()) {

        if (!KeyguardWmStateRefactor.isEnabled()

                && mGoingAwayRequestedForUserId != mSelectedUserInteractor.getSelectedUserId()) {

            Log.e(TAG, "Setting pendingLock = true due to userId mismatch. Requested: "

                    + mGoingAwayRequestedForUserId + ", current: "

                    + mSelectedUserInteractor.getSelectedUserId());