| commit | 6ce668cefda05117c0e35a60d4f12c350b7577c7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 17 13:49:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 17 13:49:48 2023 +0000 |
| tree | 1d93ddf30441cd5cb18aa6fa7a0c682d70d36d03 | |
| parent | ac774ecb5ea3a1ca1135a1140dc9e277231e1315 [diff] | |
| parent | 486ca72e660e4ed9a4bfc5e5e80738c1ac266b85 [diff] |
Merge "Updated CTS test for Android Security b/231322873" into rvc-dev am: 9e2c580dda am: 77776179f0 am: 304ba8aad6 am: 486ca72e66 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22104391 Change-Id: I5e043fcc1ce6a629a08782f718cdda4fb1c36780 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2022_20415.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2022_20415.java index 511cbd4..e12c925 100644 --- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2022_20415.java +++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2022_20415.java
@@ -16,6 +16,7 @@ package android.security.cts; +import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeNoException; import android.platform.test.annotations.AsbSecurityTest; @@ -37,6 +38,11 @@ @Test public void testPocCVE_2022_20415() { try { + // Test is not applicable for watch devices so skipping the test for watch devices + assumeFalse( + "Skipping the test for watch devices", + getDevice().hasFeature("android.hardware.type.watch")); + final String testPkg = "android.security.cts.CVE_2022_20415"; // Install the test-app