Snap for 9122715 from 86791dc60355fdce3f94028693d37953d5b5bc4b to android12L-tests-release

Change-Id: I49e5c888aa492d5a1f699860997f38bd04fc9012

2 files changed, 7 insertions, 1 deletions

diff --git a/tests/tests/match_flags/src/android/matchflags/cts/MatchFlagTests.java b/tests/tests/match_flags/src/android/matchflags/cts/MatchFlagTests.java
index 119ef871ca0..ddc8a63018a 100644
--- a/tests/tests/match_flags/src/android/matchflags/cts/MatchFlagTests.java
+++ b/tests/tests/match_flags/src/android/matchflags/cts/MatchFlagTests.java
@@ -17,9 +17,11 @@
 package android.matchflags.cts;
 
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -57,6 +59,10 @@ public class MatchFlagTests {
 
     @Test
     public void startNoBrowserIntentWithNoMatchingApps() throws Exception {
+        assumeFalse("Skipping test for watch",
+                InstrumentationRegistry.getInstrumentation().getTargetContext()
+                        .getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));
+
         Intent onlyBrowserIntent = new Intent(Intent.ACTION_VIEW)
                 .addCategory(Intent.CATEGORY_BROWSABLE)
                 .setData(Uri.parse(ONLY_BROWSER_URI));
diff --git a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
index 56e05d4573a..83e1ef55661 100644
--- a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
+++ b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
@@ -302,7 +302,7 @@ public class CapturedActivity extends Activity {
 
             Rect boundsToCheck = animationTestCase.getBoundsToCheck(marginedLayout);
 
-            if (boundsToCheck.width() < 90 || boundsToCheck.height() < 90) {
+            if (boundsToCheck.width() < 40 || boundsToCheck.height() < 40) {
                 fail("capture bounds too small to be a fullscreen activity: " + boundsToCheck);
             }