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

Commit 07b19996 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Improve rotationForActivityInDifferentOrientation." into tm-qpr-dev am:... 

Merge "Improve rotationForActivityInDifferentOrientation." into tm-qpr-dev am: 2c2aeb09 am: 8fa15b3f

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



Change-Id: I8d1c7557b7fc8932b5b1e6c052d3bc41e91355ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87c1649d 8fa15b3f

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

+2 −5
Original line number Diff line number Diff line
@@ -1756,12 +1756,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            return ROTATION_UNDEFINED;

        }

        if (activityOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) {

            // TODO(b/266280737): Use ActivityRecord#canDefineOrientationForActivitiesAbove

            final ActivityRecord nextCandidate = getActivity(

                    a -> a.getOverrideOrientation() != SCREEN_ORIENTATION_UNSET

                            && a.getOverrideOrientation()

                                    != ActivityInfo.SCREEN_ORIENTATION_BEHIND,

                    r, false /* includeBoundary */, true /* traverseTopToBottom */);

                    a -> a.canDefineOrientationForActivitiesAbove() /* callback */,

                    r /* boundary */, false /* includeBoundary */, true /* traverseTopToBottom */);

            if (nextCandidate != null) {

                r = nextCandidate;

            }