commit 67171cf87fc5facd8366681f21e0a4acf9562398
author Christopher Dombroski <cdombroski@google.com> Wed Jan 20 10:37:29 2021 -0800
committer Christopher Dombroski <cdombroski@google.com> Wed Jan 20 10:47:38 2021 -0800
tree bac2fd803706fe30e98a86c683dfc9625f62e4d4
parent b9faf9111975ece93eb320df2087ff95aa622347

Add mainline module test skipping to CVE-2020-0381

Bug: 160693070
Test: verify the modules match
Change-Id: I6d877ac3671fe00b241da9d741253733ea23f640

hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0381.java

diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0381.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0381.java
index 07f82bb..2d5237a 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0381.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0381.java
@@ -22,6 +22,8 @@
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 import com.android.tradefed.device.ITestDevice;
 
+import static org.junit.Assume.*;
+
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class CVE_2020_0381 extends SecurityTestCase {
 
@@ -32,6 +34,7 @@
     @SecurityTest(minPatchLevel = "2020-09")
     @Test
     public void testPocCVE_2020_0381() throws Exception {
+        assumeFalse(moduleIsPlayManaged("com.google.android.media"));
         String inputFiles[] = {"cve_2020_0381.xmf", "cve_2020_0381.info"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2020-0381",
                 AdbUtils.TMP_PATH + inputFiles[0] + " " + AdbUtils.TMP_PATH + inputFiles[1],