Merge "STS test fix for Android Security CVE-2021-0921" into pi-dev am: 354341643a am: 3c125b7503 am: ef90f39fea am: 0beac4e215 am: 18becc3e0e am: 7e78ae0a81

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/16041179

Change-Id: Ie5d362d94a5781fbea43af1df9f77787a37ffd4b

1 files changed, 8 insertions, 0 deletions

diff --git a/hostsidetests/securitybulletin/test-apps/CVE-2021-0921/src/android/security/cts/CVE_2021_0921/DeviceTest.java b/hostsidetests/securitybulletin/test-apps/CVE-2021-0921/src/android/security/cts/CVE_2021_0921/DeviceTest.java
index bb6631ad9d0..233fdb44728 100644
--- a/hostsidetests/securitybulletin/test-apps/CVE-2021-0921/src/android/security/cts/CVE_2021_0921/DeviceTest.java
+++ b/hostsidetests/securitybulletin/test-apps/CVE-2021-0921/src/android/security/cts/CVE_2021_0921/DeviceTest.java
@@ -19,6 +19,7 @@ package android.security.cts.CVE_2021_0921;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -31,6 +32,7 @@ import androidx.test.uiautomator.UiDevice;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assume.assumeNoException;
 
 @RunWith(AndroidJUnit4.class)
 public class DeviceTest {
@@ -54,6 +56,12 @@ public class DeviceTest {
     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     context.startActivity(intent);
+    try{
+      context.startActivity(intent);
+    } catch(ActivityNotFoundException e){
+      assumeNoException(e);
+      return;
+    }
 
     //wait for poc app to complete (it takes about 6 seconds)
     SystemClock.sleep(20000);