Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35bed006 authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into... 

Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db24 am: 4f9eeddd am: 7dbcebf2

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



Change-Id: I54e9460a4f8f655b941ded5472e18fbc34058b02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffa19755 7dbcebf2

core/tests/coretests/src/android/content/pm/ConstrainDisplayApisConfigTest.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -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.