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

Commit b86d989f authored by Rambo Wang's avatar Rambo Wang Committed by Gerrit Code Review
Browse files

Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier"

parents 26f3511f 6fc5438d

core/java/android/net/MatchAllNetworkSpecifier.java

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ public final class MatchAllNetworkSpecifier extends NetworkSpecifier implements 
    }



    /** @hide */

    public boolean satisfiedBy(NetworkSpecifier other) {

    @Override

    public boolean canBeSatisfiedBy(NetworkSpecifier other) {

        /*

         * The method is called by a NetworkRequest to see if it is satisfied by a proposed

         * network (e.g. as offered by a network factory). Since MatchAllNetweorkSpecifier must

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

+2 −2
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ class MatchAllNetworkSpecifierTest { 
    }



    @Test(expected = IllegalStateException::class)

    fun testSatisfiedBy() {

    fun testCanBeSatisfiedBy() {

        val specifier = MatchAllNetworkSpecifier()

        val discoverySession = Mockito.mock(DiscoverySession::class.java)

        val peerHandle = Mockito.mock(PeerHandle::class.java)

        val wifiAwareNetworkSpecifier = WifiAwareNetworkSpecifier.Builder(discoverySession,

                peerHandle).build()

        specifier.satisfiedBy(wifiAwareNetworkSpecifier)

        specifier.canBeSatisfiedBy(wifiAwareNetworkSpecifier)

    }

}