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

Commit 33265162 authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Fix unlock failure when app is in reverse portrait orientation." into... 

Merge "Fix unlock failure when app is in reverse portrait orientation." into sc-v2-dev am: b9ee2b5e

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

Change-Id: Iebaa240df63a197187ba9c4b4985bc24aaa254c7
parents 5c8f886b b9ee2b5e

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

+6 −2
Original line number Diff line number Diff line
@@ -1816,7 +1816,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
@@ -3064,7 +3068,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
@@ -410,8 +410,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
@@ -758,9 +758,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();

        }