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

Commit ed140cf4 authored by Mariia Sandrikova's avatar Mariia Sandrikova
Browse files

Improve rotationForActivityInDifferentOrientation. 

Reusing ActivityRecord#canDefineOrientationForActivitiesAbove in DisplayContent#rotationForActivityInDifferentOrientation

Fix: 266280737
Test: still pass
Change-Id: I02928d4d6f37cd000e915e03d7c59a00d354760a
parent c1cb41e9

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

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

            return ROTATION_UNDEFINED;

        }

        }

        if (activityOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) {

        if (activityOrientation == ActivityInfo.SCREEN_ORIENTATION_BEHIND) {

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

            final ActivityRecord nextCandidate = getActivity(

            final ActivityRecord nextCandidate = getActivity(

                    a -> a.getOverrideOrientation() != SCREEN_ORIENTATION_UNSET

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

                            && a.getOverrideOrientation()

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

                                    != ActivityInfo.SCREEN_ORIENTATION_BEHIND,

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

            if (nextCandidate != null) {

            if (nextCandidate != null) {

                r = nextCandidate;

                r = nextCandidate;

            }

            }