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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I7f90c6b8522de5a5a5a9a6c521ee23222bfb2773
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:32:04 +00:00
committed by Automerger Merge Worker

View File

@@ -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.