From 39675c9bbec050c5fd620699a160b8e81245bb3b Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Tue, 30 May 2023 18:59:34 +0000
Subject: [PATCH] Add check in #shouldReverseRotationDirectionAroundZAxis

... to return false for non-default displays. The property that it
uses (config_deviceStatesToReverseDefaultDisplayRotationAroundZAxis)
indicates that it should only apply to default displays.

Fixes: 281939489
Test: Steps in b/281939489#comment#11
Test: atest DisplayRotationTests
Test: Rear display mode rotation with and without rotation lock
Change-Id: I0d9d606b22c8cc5f2710b782faad2b44343d6462
---
 .../com/android/server/wm/DeviceStateController.java  |  8 ++++++--
 .../java/com/android/server/wm/DisplayRotation.java   |  4 ++--
 .../com/android/server/wm/DisplayRotationTests.java   | 11 +++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/services/core/java/com/android/server/wm/DeviceStateController.java b/services/core/java/com/android/server/wm/DeviceStateController.java
index 41c052d950539..54221e058d810 100644
--- a/services/core/java/com/android/server/wm/DeviceStateController.java
+++ b/services/core/java/com/android/server/wm/DeviceStateController.java
@@ -122,9 +122,13 @@ final class DeviceStateController implements DeviceStateManager.DeviceStateCallb
     }
 
     /**
-     * @return true if the rotation direction on the Z axis should be reversed.
+     * @return true if the rotation direction on the Z axis should be reversed for the default
+     * display.
      */
-    boolean shouldReverseRotationDirectionAroundZAxis() {
+    boolean shouldReverseRotationDirectionAroundZAxis(@NonNull DisplayContent displayContent) {
+        if (!displayContent.isDefaultDisplay) {
+            return false;
+        }
         return ArrayUtils.contains(mReverseRotationAroundZAxisStates, mCurrentState);
     }
 
diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java
index bc1ddf8f66bc9..9255789d13b2d 100644
--- a/services/core/java/com/android/server/wm/DisplayRotation.java
+++ b/services/core/java/com/android/server/wm/DisplayRotation.java
@@ -950,7 +950,7 @@ public class DisplayRotation {
     }
 
     void freezeRotation(int rotation) {
-        if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()) {
+        if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis(mDisplayContent)) {
             rotation = RotationUtils.reverseRotationDirectionAroundZAxis(rotation);
         }
 
@@ -1225,7 +1225,7 @@ public class DisplayRotation {
         if (mFoldController != null && mFoldController.shouldIgnoreSensorRotation()) {
             sensorRotation = -1;
         }
-        if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()) {
+        if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis(mDisplayContent)) {
             sensorRotation = RotationUtils.reverseRotationDirectionAroundZAxis(sensorRotation);
         }
         mLastSensorRotation = sensorRotation;
diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
index 04e1d9c07a07a..2a8f0ffc4d49d 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
@@ -59,10 +59,10 @@ import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.hardware.devicestate.DeviceStateManager;
+import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManagerInternal;
 import android.os.SystemClock;
-import android.os.Handler;
 import android.platform.test.annotations.Presubmit;
 import android.provider.Settings;
 import android.view.DisplayAddress;
@@ -518,7 +518,8 @@ public class DisplayRotationTests {
         mBuilder.build();
         configureDisplayRotation(SCREEN_ORIENTATION_PORTRAIT, false, false);
 
-        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(true);
+        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis(mMockDisplayContent))
+                .thenReturn(true);
 
         thawRotation();
 
@@ -544,7 +545,8 @@ public class DisplayRotationTests {
     @Test
     public void testFreezeRotation_reverseRotationDirectionAroundZAxis_yes() throws Exception {
         mBuilder.build();
-        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(true);
+        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis(mMockDisplayContent))
+                .thenReturn(true);
 
         freezeRotation(Surface.ROTATION_90);
         assertEquals(Surface.ROTATION_270, mTarget.getUserRotation());
@@ -553,7 +555,8 @@ public class DisplayRotationTests {
     @Test
     public void testFreezeRotation_reverseRotationDirectionAroundZAxis_no() throws Exception {
         mBuilder.build();
-        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(false);
+        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis(mMockDisplayContent))
+                .thenReturn(false);
 
         freezeRotation(Surface.ROTATION_90);
         assertEquals(Surface.ROTATION_90, mTarget.getUserRotation());