diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-08 15:53:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-08 15:53:51 +0000 |
commit | d6e2122ebc56af1cc538bf2775e8bd445084e806 (patch) | |
tree | 1bd48afd39ae6d203276b30f6190ac88606fa08d | |
parent | dcd3654701edf8a664358439c23fadc399faa789 (diff) | |
parent | 857055bd5ab8cd73a3975e2ddbefa57b81ea3a00 (diff) | |
download | cts-d6e2122ebc56af1cc538bf2775e8bd445084e806.tar.gz |
Merge "STS test for Android Security CVE-2021-0485" into rvc-dev
21 files changed, 22 insertions, 1 deletions
diff --git a/tests/framework/base/windowmanager/Android.mk b/tests/framework/base/windowmanager/Android.mk index ef6a95eb75a..39d08127976 100644 --- a/tests/framework/base/windowmanager/Android.mk +++ b/tests/framework/base/windowmanager/Android.mk @@ -44,7 +44,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ CtsMockInputMethodLib \ metrics-helper-lib \ -LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests +LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests sts LOCAL_SDK_VERSION := test_current diff --git a/tests/framework/base/windowmanager/alertwindowapp/Android.bp b/tests/framework/base/windowmanager/alertwindowapp/Android.bp index 07069deff76..c8245da1b6b 100644 --- a/tests/framework/base/windowmanager/alertwindowapp/Android.bp +++ b/tests/framework/base/windowmanager/alertwindowapp/Android.bp @@ -29,5 +29,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp b/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp index e7cbcdba8f3..fd6d943be6f 100644 --- a/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp +++ b/tests/framework/base/windowmanager/alertwindowappsdk25/Android.bp @@ -31,5 +31,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/alertwindowservice/Android.bp b/tests/framework/base/windowmanager/alertwindowservice/Android.bp index 58d8688919f..6aee4e4056d 100644 --- a/tests/framework/base/windowmanager/alertwindowservice/Android.bp +++ b/tests/framework/base/windowmanager/alertwindowservice/Android.bp @@ -27,6 +27,7 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], dex_preopt: { diff --git a/tests/framework/base/windowmanager/app/Android.bp b/tests/framework/base/windowmanager/app/Android.bp index b12f93b2d6d..3512924d721 100644 --- a/tests/framework/base/windowmanager/app/Android.bp +++ b/tests/framework/base/windowmanager/app/Android.bp @@ -33,5 +33,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/app27/Android.bp b/tests/framework/base/windowmanager/app27/Android.bp index 6ddf919c573..79d2d22974e 100644 --- a/tests/framework/base/windowmanager/app27/Android.bp +++ b/tests/framework/base/windowmanager/app27/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/appAShareUid/Android.bp b/tests/framework/base/windowmanager/appAShareUid/Android.bp index 57adfd61346..052f829921b 100644 --- a/tests/framework/base/windowmanager/appAShareUid/Android.bp +++ b/tests/framework/base/windowmanager/appAShareUid/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/appBShareUid/Android.bp b/tests/framework/base/windowmanager/appBShareUid/Android.bp index ec15e80daf9..8fe4775ea67 100644 --- a/tests/framework/base/windowmanager/appBShareUid/Android.bp +++ b/tests/framework/base/windowmanager/appBShareUid/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp b/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp index c83b44fd116..8582bf1e5a2 100644 --- a/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp +++ b/tests/framework/base/windowmanager/appDeprecatedSdk/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/appDisplaySize/Android.bp b/tests/framework/base/windowmanager/appDisplaySize/Android.bp index 819a9bfafeb..d492d7bfcb7 100644 --- a/tests/framework/base/windowmanager/appDisplaySize/Android.bp +++ b/tests/framework/base/windowmanager/appDisplaySize/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp b/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp index d110d199495..6f5d5e4b61e 100644 --- a/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp +++ b/tests/framework/base/windowmanager/appPrereleaseSdk/Android.bp @@ -24,5 +24,6 @@ android_test_helper_app { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/appProfileable/Android.bp b/tests/framework/base/windowmanager/appProfileable/Android.bp index cd540941943..2dcd954868f 100644 --- a/tests/framework/base/windowmanager/appProfileable/Android.bp +++ b/tests/framework/base/windowmanager/appProfileable/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts" ], } diff --git a/tests/framework/base/windowmanager/appSecondUid/Android.bp b/tests/framework/base/windowmanager/appSecondUid/Android.bp index 5f44f5c971b..692f73bbef1 100644 --- a/tests/framework/base/windowmanager/appSecondUid/Android.bp +++ b/tests/framework/base/windowmanager/appSecondUid/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/appThirdUid/Android.bp b/tests/framework/base/windowmanager/appThirdUid/Android.bp index 08a878ccb79..22bab9d60ed 100644 --- a/tests/framework/base/windowmanager/appThirdUid/Android.bp +++ b/tests/framework/base/windowmanager/appThirdUid/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/dndsourceapp/Android.bp b/tests/framework/base/windowmanager/dndsourceapp/Android.bp index 7abd47847ce..9a1463e1937 100644 --- a/tests/framework/base/windowmanager/dndsourceapp/Android.bp +++ b/tests/framework/base/windowmanager/dndsourceapp/Android.bp @@ -26,5 +26,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/dndtargetapp/Android.bp b/tests/framework/base/windowmanager/dndtargetapp/Android.bp index 00b40551e91..0a14121d22e 100644 --- a/tests/framework/base/windowmanager/dndtargetapp/Android.bp +++ b/tests/framework/base/windowmanager/dndtargetapp/Android.bp @@ -24,6 +24,7 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], static_libs: ["cts-wm-app-base"], diff --git a/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp b/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp index 13dbca2e31f..4420670fa80 100644 --- a/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp +++ b/tests/framework/base/windowmanager/dndtargetappsdk23/Android.bp @@ -24,6 +24,7 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], static_libs: ["cts-wm-app-base"], diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java index 98e5ff5b874..6e19de2ec1c 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java @@ -91,6 +91,7 @@ import android.graphics.Rect; import android.os.Handler; import android.os.Looper; import android.platform.test.annotations.Presubmit; +import android.platform.test.annotations.SecurityTest; import android.provider.Settings; import android.server.wm.CommandSession.ActivityCallback; import android.server.wm.CommandSession.SizeInfo; @@ -278,6 +279,7 @@ public class PinnedStackTests extends ActivityManagerTestBase { } @Test + @SecurityTest(minPatchLevel="2021-03") public void testEnterPipWithTinyMinimalSize() throws Exception { // Launch a PiP activity with minimal size specified and smaller than allowed minimum launchActivity(PIP_ACTIVITY_WITH_TINY_MINIMAL_SIZE, EXTRA_ENTER_PIP, "true"); diff --git a/tests/framework/base/windowmanager/translucentapp/Android.bp b/tests/framework/base/windowmanager/translucentapp/Android.bp index c551c29896c..3a19970473d 100644 --- a/tests/framework/base/windowmanager/translucentapp/Android.bp +++ b/tests/framework/base/windowmanager/translucentapp/Android.bp @@ -31,5 +31,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/framework/base/windowmanager/translucentappsdk26/Android.bp b/tests/framework/base/windowmanager/translucentappsdk26/Android.bp index 7c8d0d88929..4ec800b6fd0 100644 --- a/tests/framework/base/windowmanager/translucentappsdk26/Android.bp +++ b/tests/framework/base/windowmanager/translucentappsdk26/Android.bp @@ -29,5 +29,6 @@ android_test { "cts", "vts10", "general-tests", + "sts", ], } diff --git a/tests/inputmethod/mockime/Android.bp b/tests/inputmethod/mockime/Android.bp index c73f870dedd..dbf6ad18eb6 100644 --- a/tests/inputmethod/mockime/Android.bp +++ b/tests/inputmethod/mockime/Android.bp @@ -42,6 +42,7 @@ android_test_helper_app { "cts", "vts10", "general-tests", + "sts", ], static_libs: [ "androidx.annotation_annotation", |