diff options
| author | 2022-11-10 11:58:30 +0000 | |
|---|---|---|
| committer | 2022-11-10 11:58:30 +0000 | |
| commit | 7dbcebf2aea55e2f70cc2d7d48756071d2deef07 (patch) | |
| tree | 1b5da112e0a1166e043f401ac6e9e4c6939047e4 | |
| parent | 9b6a6d8ff1d3e360be576e02e6e3650697c629e3 (diff) | |
| parent | 4f9eeddd249a450135fdbcb27405f2d80c576d55 (diff) | |
Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 am: 4f9eeddd24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503
Change-Id: I3589a3b1582e0112f991b02d4712b450033ae889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java b/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java index 98485c024a59..ee73f00d9d46 100644 --- a/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java +++ b/core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java @@ -29,10 +29,11 @@ import androidx.test.filters.SmallTest; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** - * Test class for {@link ConstrainDisplayApisConfig}. + * Test for {@link ConstrainDisplayApisConfig}. * * Build/Install/Run: * atest FrameworksCoreTests:ConstrainDisplayApisConfigTest @@ -72,6 +73,7 @@ public final class ConstrainDisplayApisConfigTest { testNeverConstrainDisplayApis("com.android.test", /* version= */ 1, /* expected= */ false); } + @Ignore("b/257375674") @Test public void neverConstrainDisplayApis_flagsHasSingleEntry_returnsTrueForPackageWithinRange() { setNeverConstrainDisplayApisFlag("com.android.test:1:1"); @@ -107,6 +109,7 @@ public final class ConstrainDisplayApisConfigTest { testNeverConstrainDisplayApis("com.android.test4", /* version= */ 9, /* expected= */ false); } + @Ignore("b/257375674") @Test public void neverConstrainDisplayApis_flagHasInvalidEntries_ignoresInvalidEntries() { // We add a valid entry before and after the invalid ones to make sure they are applied. |