commit d9bbb54c12b1c551c7cc49e21d552968eefb7a88
author Roy Chou <juchengchou@google.com> Mon Apr 10 08:06:40 2023 +0000
committer Roy Chou <juchengchou@google.com> Mon Apr 10 15:19:46 2023 +0000
tree 6873a2457f4962e925ccdc96732d96764200e6fe
parent c01c5f8875be42e7b397b0dd46b35bb15c34804d

fix(#Magnification): fix WindowMagnificationControllerTest#enableWindowMagnification_rotationIsChanged_updateRotationValue fails on x86 devices

The test case becomes flaky on udc-dev branch after build 9881258. I think it might because the resource config orientation might be undefined sometimes, so the orientation changed would be neglected when config.diff and thus the mRotation would not update correctly. Therefore, I add orientation check in test setUp to prevent the orientation from being undefined.

Bug: 277093220
Bug: 276925992
Test: atest WindowMagnificationControllerTest on cf_x86_64_phone/foldable
      presubmit
Change-Id: I67ce4f7ff60beb3dbf72b14799ea867978bf06ba

packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
index 0978c82..9c36af3 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
@@ -18,6 +18,7 @@
 
 import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
+import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
 import static android.view.Choreographer.FrameCallback;
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
@@ -172,6 +173,12 @@
                 returnsSecondArg());
 
         mResources = getContext().getOrCreateTestableResources().getResources();
+        // prevent the config orientation from undefined, which may cause config.diff method
+        // neglecting the orientation update.
+        if (mResources.getConfiguration().orientation == ORIENTATION_UNDEFINED) {
+            mResources.getConfiguration().orientation = ORIENTATION_PORTRAIT;
+        }
+
         mWindowMagnificationAnimationController = new WindowMagnificationAnimationController(
                 mContext, mValueAnimator);
         mWindowMagnificationController =
@@ -688,7 +695,11 @@
 
     @Test
     public void enableWindowMagnification_rotationIsChanged_updateRotationValue() {
-        final Configuration config = mContext.getResources().getConfiguration();
+        // the config orientation should not be undefined, since it would cause config.diff
+        // returning 0 and thus the orientation changed would not be detected
+        assertNotEquals(ORIENTATION_UNDEFINED, mResources.getConfiguration().orientation);
+
+        final Configuration config = mResources.getConfiguration();
         config.orientation = config.orientation == ORIENTATION_LANDSCAPE ? ORIENTATION_PORTRAIT
                 : ORIENTATION_LANDSCAPE;
         final int newRotation = simulateRotateTheDevice();