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

Commit 0a11444d authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Ignore verifying canBeSatisfiedBy() on Android Q" am: 72cb973a am: 31f0ae67 

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

Change-Id: I473bf0f260309a9b1a30b1957714032f1f06b9f6
parents 9d956d7c 31f0ae67

tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt

+7 −2
Original line number Diff line number Diff line
@@ -53,8 +53,13 @@ class MatchAllNetworkSpecifierTest { 
        assertParcelSane(MatchAllNetworkSpecifier(), 0)

    }



    @Test @IgnoreAfter(Build.VERSION_CODES.R)

    fun testCanBeSatisfiedBy_BeforeS() {

    @Test

    @IgnoreUpTo(Build.VERSION_CODES.Q)

    @IgnoreAfter(Build.VERSION_CODES.R)

    // Only run this test on Android R.

    // The method - satisfiedBy() has changed to canBeSatisfiedBy() starting from Android R, so the

    // method - canBeSatisfiedBy() cannot be found when running this test on Android Q.

    fun testCanBeSatisfiedBy_OnlyForR() {

        // MatchAllNetworkSpecifier didn't follow its parent class to change the satisfiedBy() to

        // canBeSatisfiedBy(), so if a caller calls MatchAllNetworkSpecifier#canBeSatisfiedBy(), the

        // NetworkSpecifier#canBeSatisfiedBy() will be called actually, and false will be returned.