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

Commit 1362e17b authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Wait for unknown vis to resolve before forcing keyguard orientation"... 

Merge "Wait for unknown vis to resolve before forcing keyguard orientation" into pi-dev am: 50029013
am: 51ca8146

Change-Id: I559cac9e06b1bd3b6ae716a714b16f42ef5917ac
parents 2697b7c0 51ca8146

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

+6 −2
Original line number Diff line number Diff line
@@ -3728,8 +3728,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


            mLastWindowForcedOrientation = SCREEN_ORIENTATION_UNSPECIFIED;



            if (policy.isKeyguardShowingAndNotOccluded()

                    || mService.mAppTransition.getAppTransition() == TRANSIT_KEYGUARD_UNOCCLUDE) {

            // Only allow force setting the orientation when all unknown visibilities have been

            // resolved, as otherwise we just may be starting another occluding activity.

            final boolean isUnoccluding =

                    mService.mAppTransition.getAppTransition() == TRANSIT_KEYGUARD_UNOCCLUDE

                            && mService.mUnknownAppVisibilityController.allResolved();

            if (policy.isKeyguardShowingAndNotOccluded() || isUnoccluding) {

                return mLastKeyguardForcedOrientation;

            }