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

Commit 3c562532 authored by Lucas Lin's avatar Lucas Lin Committed by Android (Google) Code Review
Browse files

Merge "Ignore verifying canBeSatisfiedBy() on Android Q" into mainline-prod

parents 2ebb54e7 d0c92ed5
Loading
Loading
Loading
Loading
+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.