Improve rotationForActivityInDifferentOrientation.

Reusing ActivityRecord#canDefineOrientationForActivitiesAbove in DisplayContent#rotationForActivityInDifferentOrientation

Fix: 266280737
Test: still pass
Change-Id: I02928d4d6f37cd000e915e03d7c59a00d354760a
This commit is contained in:
Mariia Sandrikova
2023-01-29 20:12:38 +00:00
parent c1cb41e9f7
commit ed140cf4a2

View File

@@ -1710,12 +1710,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;
}