commit 07b19996c17981626e0ce26d804ba9fe173be83a
author Mariia Sandrikova <mariiasand@google.com> Tue Jan 31 17:03:22 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 31 17:03:22 2023 +0000
tree f0ee74efc2ab48525608735a9c7de541f7cf713a
parent 87c1649d1020d75557bc486d885afb89159ccefa
parent 8fa15b3ff77acbb30248e07d283180e8295d76c4

Merge "Improve rotationForActivityInDifferentOrientation." into tm-qpr-dev am: 2c2aeb0941 am: 8fa15b3ff7

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

Change-Id: I8d1c7557b7fc8932b5b1e6c052d3bc41e91355ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index f183760..f592f9a 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1756,12 +1756,9 @@
             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;
             }