commit e9788dd03526dc38a3bcb77482fe13067d02074f
author Miroslaw Niemiec <mniemiec@google.com> Mon Nov 09 20:06:03 2020 +0000
committer Christopher Dombroski <cdombroski@google.com> Fri Nov 13 00:44:22 2020 +0000
tree 180756705944fd2be9f86d0cf26bb004ba735571
parent 8af85392f5bc1b4b9bcf1b0ac7e63cbd13449b69

STS test for Android Security CVE-2020-0099

Test: [sts-tradefed run sts-engbuild-no-spl-lock -m CtsDisplayTestCases -t android.display.cts.VirtualDisplayTest]
Bug: 151667477
Bug: 141745510
Change-Id: I2ee0ad4532d7847aea8e9b3f002fe97a05e8eb68
Merged-In: I2ee0ad4532d7847aea8e9b3f002fe97a05e8eb68

tests/tests/display/Android.mk

diff --git a/tests/tests/display/Android.mk b/tests/tests/display/Android.mk
index 4ad08a3..cf9430f 100644
--- a/tests/tests/display/Android.mk
+++ b/tests/tests/display/Android.mk
@@ -30,7 +30,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_COMPATIBILITY_SUITE := cts sts
 
 LOCAL_PACKAGE_NAME := CtsDisplayTestCases
 

tests/tests/display/src/android/display/cts/VirtualDisplayTest.java

diff --git a/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java b/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java
index db57eed..bf6e472 100644
--- a/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java
+++ b/tests/tests/display/src/android/display/cts/VirtualDisplayTest.java
@@ -31,6 +31,7 @@
 import android.os.Looper;
 import android.os.HandlerThread;
 import android.os.SystemClock;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -116,6 +117,7 @@
      * Ensures that an application can create a private virtual display and show
      * its own windows on it.
      */
+    @SecurityTest
     public void testPrivateVirtualDisplay() throws Exception {
         VirtualDisplay virtualDisplay = mDisplayManager.createVirtualDisplay(NAME,
                 WIDTH, HEIGHT, DENSITY, mSurface, 0);
@@ -139,6 +141,7 @@
      * Ensures that an application can create a private presentation virtual display and show
      * its own windows on it.
      */
+    @SecurityTest
     public void testPrivatePresentationVirtualDisplay() throws Exception {
         VirtualDisplay virtualDisplay = mDisplayManager.createVirtualDisplay(NAME,
                 WIDTH, HEIGHT, DENSITY, mSurface,
@@ -163,6 +166,7 @@
      * Ensures that an application can create a private virtual display and show
      * its own windows on it where the surface is attached or detached dynamically.
      */
+    @SecurityTest
     public void testPrivateVirtualDisplayWithDynamicSurface() throws Exception {
         VirtualDisplay virtualDisplay = mDisplayManager.createVirtualDisplay(NAME,
                 WIDTH, HEIGHT, DENSITY, null, 0);