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

Merge "Fix WmTests for devices with ro.bootanim.set_orientation_<display_id>" into tm-qpr-dev

Browse Source
This commit is contained in:
Mariia Sandrikova
2023-01-24 13:36:40 +00:00
committed by Android (Google) Code Review
parent 8ec492a739 ba0b2fa370
commit 4fc510679e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java
View File

@@ -18,6 +18,7 @@ package com.android.server.wm;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS;
import static android.view.Surface.ROTATION_0;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_BOTTOM; import static android.view.WindowManagerPolicyConstants.NAV_BAR_BOTTOM;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.any; import static com.android.dx.mockito.inline.extended.ExtendedMockito.any;
@@ -78,6 +79,12 @@ class TestDisplayContent extends DisplayContent {
final InputMonitor inputMonitor = getInputMonitor(); final InputMonitor inputMonitor = getInputMonitor();
spyOn(inputMonitor); spyOn(inputMonitor);
doNothing().when(inputMonitor).resumeDispatchingLw(any()); doNothing().when(inputMonitor).resumeDispatchingLw(any());
// For devices that set the sysprop ro.bootanim.set_orientation_<display_id>
// See DisplayRotation#readDefaultDisplayRotation for context.
// Without that, meaning of height and width in context of the tests can be swapped if
// the default rotation is 90 or 270.
displayRotation.setRotation(ROTATION_0);
} }
public static class Builder { public static class Builder {