Merge "Display-level relative display rotation should be 0" into tm-qpr-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 95d71a36313f..71c80fb9a97c 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -6729,4 +6729,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
     DisplayContent asDisplayContent() {
         return this;
     }
+
+    @Override
+    @Surface.Rotation
+    int getRelativeDisplayRotation() {
+        // Display is the root, so it's not rotated relative to anything.
+        return Surface.ROTATION_0;
+    }
 }