From f3afe5a579de1e3eba2fc01ffeb8da9e9cd5c0a2 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Fri, 7 Aug 2020 15:35:17 +0800 Subject: [PATCH] Mark some virtual display flags as TestApi to test their behaviors Bug: 162627132 Test: atest VirtualDisplayTest#testTrustedVirtualDisplay Test: atest VirtualDisplayTest#testUntrustedSysDecorVirtualDisplay Change-Id: I8e32cb42d93c59c015def0b0593038a0d961e3d4 --- api/test-current.txt | 2 ++ core/java/android/hardware/display/DisplayManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 3332525a66472..16b8c21984656 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1303,6 +1303,8 @@ package android.hardware.display { method public android.graphics.Point getStableDisplaySize(); method public boolean isMinimalPostProcessingRequested(int); method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration); + field public static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 512; // 0x200 + field public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1024; // 0x400 } } diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index c1ba2094d3cf6..392f56212058b 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -310,6 +310,7 @@ public final class DisplayManager { * @hide */ // TODO (b/114338689): Remove the flag and use IWindowManager#setShouldShowSystemDecors + @TestApi public static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 1 << 9; /** @@ -320,6 +321,7 @@ public final class DisplayManager { * @see #VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS * @hide */ + @TestApi public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1 << 10; /** @hide */