diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-30 20:43:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-09-30 20:43:03 +0000 |
commit | 137b5a6280372eac9505e0bf6797c8a0e40d1456 (patch) | |
tree | 29c2ffe1b83b166b32dd6792093e980bf725ad30 | |
parent | a4a64fca8a755f2e34bda3bcb1f579f7d7f0ac6b (diff) | |
parent | 2b1d324d9f7d1d8dfd13f6f306eadc86a00a4be9 (diff) | |
download | cts-137b5a6280372eac9505e0bf6797c8a0e40d1456.tar.gz |
Merge "Snap for 9122715 from 86791dc60355fdce3f94028693d37953d5b5bc4b to android12L-tests-release" into android12L-tests-release
-rw-r--r-- | tests/tests/match_flags/src/android/matchflags/cts/MatchFlagTests.java | 6 | ||||
-rw-r--r-- | tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java | 2 |
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); } |