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

Merge "Reduce dependency of real device for wm unit test" into udc-dev am: daf028959d am: 9e73cda282

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23532378

Change-Id: Ic958ecc33550cb7efe14bd9f279346b63e9da133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-06-02 16:14:55 +00:00
committed by Automerger Merge Worker
parent 620f397c95 9e73cda282
commit b5068b3e6e
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
View File

@@ -1996,7 +1996,8 @@ public class ActivityRecordTests extends WindowTestsBase {
assertTrue(activity.isSnapshotCompatible(snapshot));
setRotatedScreenOrientationSilently(activity);
doReturn(task.getWindowConfiguration().getRotation() + 1).when(mDisplayContent)
.rotationForActivityInDifferentOrientation(activity);
assertFalse(activity.isSnapshotCompatible(snapshot));
}

8
services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
View File

@@ -4655,14 +4655,6 @@ public class SizeCompatTests extends WindowTestsBase {
return c;
}
private static void resizeDisplay(DisplayContent displayContent, int width, int height) {
displayContent.updateBaseDisplayMetrics(width, height, displayContent.mBaseDisplayDensity,
displayContent.mBaseDisplayPhysicalXDpi, displayContent.mBaseDisplayPhysicalYDpi);
final Configuration c = new Configuration();
displayContent.computeScreenConfiguration(c);
displayContent.onRequestedOverrideConfigurationChanged(c);
}
private static void setNeverConstrainDisplayApisFlag(@Nullable String value,
boolean makeDefault) {
DeviceConfig.setProperty(NAMESPACE_CONSTRAIN_DISPLAY_APIS,

4
services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java
View File

@@ -127,6 +127,10 @@ public class WallpaperControllerTests extends WindowTestsBase {
public void testWallpaperSizeWithFixedTransform() {
// No wallpaper
final DisplayContent dc = mDisplayContent;
if (dc.mBaseDisplayHeight == dc.mBaseDisplayWidth) {
// Make sure the size is different when changing orientation.
resizeDisplay(dc, 500, 1000);
}
// No wallpaper WSA Surface
final WindowState wallpaperWindow = createWallpaperWindow(dc);

9
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
View File

@@ -71,6 +71,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.res.Configuration;
import android.graphics.Insets;
import android.graphics.Rect;
import android.hardware.HardwareBuffer;
@@ -946,6 +947,14 @@ class WindowTestsBase extends SystemServiceTestsBase {
dc.setRotationAnimation(null);
}
static void resizeDisplay(DisplayContent displayContent, int width, int height) {
displayContent.updateBaseDisplayMetrics(width, height, displayContent.mBaseDisplayDensity,
displayContent.mBaseDisplayPhysicalXDpi, displayContent.mBaseDisplayPhysicalYDpi);
final Configuration c = new Configuration();
displayContent.computeScreenConfiguration(c);
displayContent.onRequestedOverrideConfigurationChanged(c);
}
// The window definition for UseTestDisplay#addWindows. The test can declare to add only
// necessary windows, that avoids adding unnecessary overhead of unused windows.
static final int W_NOTIFICATION_SHADE = TYPE_NOTIFICATION_SHADE;