STS test update for CVE-2020-0461

Bug: 170662025
Bug: 169162127
Test: sts-tradefed run sts-engbuild-no-spl-lock -m CtsSecurityBulletinHostTestCases -t android.security.cts.CVE_2020_0461#testPocCVE_2020_0461
Change-Id: Ifac6ac267dfe9ef54234c83c5013463e7ab376ab
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java
index 92aa626..81100e6 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0461.java
@@ -33,29 +33,14 @@
      * b/162741784
      */
     @Test
-    @SecurityTest(minPatchLevel = "2020-11")
+    @SecurityTest(minPatchLevel = "2020-12")
     public void testPocCVE_2020_0461() throws Exception {
-        //conditions
-        String cpu = AdbUtils.runCommandLine("getprop ro.product.cpu.abi", getDevice());
-        assumeThat(cpu, equalTo("arm64-v8a"));
-        assumeTrue(containsDriver(getDevice(), "/proc/config.gz"));
         assumeTrue(containsDriver(getDevice(),
-            "/sys/devices/system/cpu/vulnerabilities/meltdown"));
+                "/sys/devices/system/cpu/vulnerabilities/meltdown"));
         String meltdown = AdbUtils.runCommandLine(
-            "cat /sys/devices/system/cpu/vulnerabilities/meltdown", getDevice());
-        assumeThat(meltdown, equalTo("Vulnerable"));
-
-        //test
-        AdbUtils.runCommandLine("cp /proc/config.gz /data/local/tmp", getDevice());
-        AdbUtils.runCommandLine("gunzip /data/local/tmp/config.gz", getDevice());
-        String output = AdbUtils.runCommandLine(
-            "grep CONFIG_UNMAP_KERNEL_AT_EL0 /data/local/tmp/config", getDevice());
-        AdbUtils.runCommandLine("rm /data/local/tmp/config", getDevice());
-
-        // This is a bad output
-        // "" - empty output
-        // "CONFIG_UNMAP_KERNEL_AT_EL0 is not set"
-        assertFalse(output.isEmpty());
-        assertNotMatches("is not set", output);
+                "cat /sys/devices/system/cpu/vulnerabilities/meltdown", getDevice());
+        assertFalse(meltdown.startsWith("Vulnerable"));
+        assertTrue(meltdown.startsWith("Not affected") ||
+                meltdown.startsWith("Mitigation"));
     }
 }