From ed140cf4a22bf67ebc3100ad43a893149fae00f6 Mon Sep 17 00:00:00 2001
From: Mariia Sandrikova <mariiasand@google.com>
Date: Sun, 29 Jan 2023 20:12:38 +0000
Subject: [PATCH] Improve rotationForActivityInDifferentOrientation.

Reusing ActivityRecord#canDefineOrientationForActivitiesAbove in DisplayContent#rotationForActivityInDifferentOrientation

Fix: 266280737
Test: still pass
Change-Id: I02928d4d6f37cd000e915e03d7c59a00d354760a
---
 .../core/java/com/android/server/wm/DisplayContent.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 5767730abd82b..aede04bf504b4 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -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;
             }