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

Commit 0f3abd36 authored by Issei Suzuki's avatar Issei Suzuki
Browse files

Fix unlock failure when app is in reverse portrait orientation. 

When the screen is rotated, AppTransition clears app transition requests
to cancel the app transition animation, since screen rotation animation
is played. If this happens,AppTransition calls AppTransitionListener,
which ends up with IKeyguardService.startKeyguardGoingAway binder call.

This code path should be kept working when remote animation is enabled.

Bug: 196358471
Test: manual
  1. enable auto-rotate, register fingerprint, set secure lock method.
  2. run an app which supports reverse portrait mode.
  3. put the device upside down.
  4. go to lock screen
  5. unlock the device using the fingerprint sensor.
Change-Id: I7d079431d369dc7ba7d737234af6b8285111bf8d
parent c87aa1a2

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −2
Original line number Diff line number Diff line
@@ -1817,7 +1817,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            @Override

            public int onAppTransitionStartingLocked(boolean keyguardGoingAway, long duration,

                    long statusBarAnimationStartTime, long statusBarAnimationDuration) {

                return handleStartTransitionForKeyguardLw(keyguardGoingAway, duration);

                // When remote animation is enabled for KEYGUARD_GOING_AWAY transition, SysUI

                // receives IRemoteAnimationRunner#onAnimationStart to start animation, so we don't

                // need to call IKeyguardService#keyguardGoingAway here.

                return handleStartTransitionForKeyguardLw(keyguardGoingAway

                        && !WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation, duration);

            }



            @Override
@@ -3065,7 +3069,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private int handleStartTransitionForKeyguardLw(boolean keyguardGoingAway, long duration) {

        final int res = applyKeyguardOcclusionChange();

        if (res != 0) return res;

        if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation && keyguardGoingAway) {

        if (keyguardGoingAway) {

            if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation");

            startKeyguardExitAnimation(SystemClock.uptimeMillis(), duration);

        }

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+1 −2
Original line number Diff line number Diff line
@@ -406,8 +406,7 @@ public class KeyguardServiceDelegate { 
    }



    public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) {

        if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation

                && mKeyguardService != null) {

        if (mKeyguardService != null) {

            mKeyguardService.startKeyguardExitAnimation(startTime, fadeoutDuration);

        }

    }

services/core/java/com/android/server/wm/Transition.java

+7 −2
Original line number Diff line number Diff line
@@ -745,9 +745,14 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                    (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0,

                    (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE) != 0,

                    (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION) != 0);

            if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation) {

                // When remote animation is enabled for KEYGUARD_GOING_AWAY transition, SysUI

                // receives IRemoteAnimationRunner#onAnimationStart to start animation, so we don't

                // need to call IKeyguardService#keyguardGoingAway here.

                mController.mAtm.mWindowManager.mPolicy.startKeyguardExitAnimation(

                        SystemClock.uptimeMillis(), 0 /* duration */);

            }

        }

        if ((flags & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0) {

            mController.mAtm.mWindowManager.mPolicy.applyKeyguardOcclusionChange();

        }