Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Roy Chou
2023-04-10 08:06:40 +00:00
parent c01c5f8875
commit d9bbb54c12
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.systemui.accessibility;
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 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
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 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
@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();