commit d095a5e3fe36f3513e180bb2458c07bc66625315
author Kevin Chyn <kchyn@google.com> Wed Apr 26 00:01:20 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 26 00:01:20 2023 +0000
tree d60bb3ed03409e7baa89c00b1d4cbc42472baef1
parent 8c2291cc1800d0a50479c36533c9a5ef0a1cdff7
parent 4c2b792c116e04591b0d28235ca6329b944ecf32

Merge "Also reverse rotation for #freezeRotation path" into tm-qpr-dev

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

diff --git a/services/core/java/com/android/server/wm/DisplayRotation.java b/services/core/java/com/android/server/wm/DisplayRotation.java
index 0a1e29a..31b9879 100644
--- a/services/core/java/com/android/server/wm/DisplayRotation.java
+++ b/services/core/java/com/android/server/wm/DisplayRotation.java
@@ -913,6 +913,16 @@
     }
 
     void freezeRotation(int rotation) {
+        if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()) {
+            // Flipping 270 and 90 has the same effect as changing the direction which rotation is
+            // applied.
+            if (rotation == Surface.ROTATION_90) {
+                rotation = Surface.ROTATION_270;
+            } else if (rotation == Surface.ROTATION_270) {
+                rotation = Surface.ROTATION_90;
+            }
+        }
+
         rotation = (rotation == -1) ? mRotation : rotation;
         setUserRotation(WindowManagerPolicy.USER_ROTATION_LOCKED, rotation);
     }

services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java

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 950e9e4..a831b27 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
@@ -537,6 +537,24 @@
                 SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_180));
     }
 
+    @Test
+    public void testFreezeRotation_reverseRotationDirectionAroundZAxis_yes() throws Exception {
+        mBuilder.build();
+        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(true);
+
+        freezeRotation(Surface.ROTATION_90);
+        assertEquals(Surface.ROTATION_270, mTarget.getUserRotation());
+    }
+
+    @Test
+    public void testFreezeRotation_reverseRotationDirectionAroundZAxis_no() throws Exception {
+        mBuilder.build();
+        when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(false);
+
+        freezeRotation(Surface.ROTATION_90);
+        assertEquals(Surface.ROTATION_90, mTarget.getUserRotation());
+    }
+
     private boolean waitForUiHandler() {
         final CountDownLatch latch = new CountDownLatch(1);
         UiThread.getHandler().post(latch::countDown);