Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 am: 4f9eeddd24

Browse Source 
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>
This commit is contained in:
Naomi Musgrave
2022-11-10 11:58:30 +00:00
committed by Automerger Merge Worker
parent 9b6a6d8ff1 4f9eeddd24
commit 7dbcebf2ae
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java
View File

@@ -29,10 +29,11 @@ import androidx.test.filters.SmallTest;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
/** /**
* Test class for {@link ConstrainDisplayApisConfig}. * Test for {@link ConstrainDisplayApisConfig}.
* *
* Build/Install/Run: * Build/Install/Run:
* atest FrameworksCoreTests:ConstrainDisplayApisConfigTest * atest FrameworksCoreTests:ConstrainDisplayApisConfigTest
@@ -72,6 +73,7 @@ public final class ConstrainDisplayApisConfigTest {
testNeverConstrainDisplayApis("com.android.test", /* version= */ 1, /* expected= */ false); testNeverConstrainDisplayApis("com.android.test", /* version= */ 1, /* expected= */ false);
} }
@Ignore("b/257375674")
@Test @Test
public void neverConstrainDisplayApis_flagsHasSingleEntry_returnsTrueForPackageWithinRange() { public void neverConstrainDisplayApis_flagsHasSingleEntry_returnsTrueForPackageWithinRange() {
setNeverConstrainDisplayApisFlag("com.android.test:1:1"); setNeverConstrainDisplayApisFlag("com.android.test:1:1");
@@ -107,6 +109,7 @@ public final class ConstrainDisplayApisConfigTest {
testNeverConstrainDisplayApis("com.android.test4", /* version= */ 9, /* expected= */ false); testNeverConstrainDisplayApis("com.android.test4", /* version= */ 9, /* expected= */ false);
} }
@Ignore("b/257375674")
@Test @Test
public void neverConstrainDisplayApis_flagHasInvalidEntries_ignoresInvalidEntries() { public void neverConstrainDisplayApis_flagHasInvalidEntries_ignoresInvalidEntries() {
// We add a valid entry before and after the invalid ones to make sure they are applied. // We add a valid entry before and after the invalid ones to make sure they are applied.