Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier" am: b86d989fce

Browse Source 
Change-Id: Ia4f99dcf6c86a356c1490b6500dd5e5016ff7257
This commit is contained in:
Rambo Wang
2020-04-30 15:19:24 +00:00
committed by Automerger Merge Worker
parent 40a1be546c b86d989fce
commit 9544c8a20b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/MatchAllNetworkSpecifier.java
View File

@@ -43,7 +43,8 @@ public final class MatchAllNetworkSpecifier extends NetworkSpecifier implements
} }
/** @hide */ /** @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 * 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 * network (e.g. as offered by a network factory). Since MatchAllNetweorkSpecifier must

4
tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt
View File

@@ -39,12 +39,12 @@ class MatchAllNetworkSpecifierTest {
} }
@Test(expected = IllegalStateException::class) @Test(expected = IllegalStateException::class)
fun testSatisfiedBy() { fun testCanBeSatisfiedBy() {
val specifier = MatchAllNetworkSpecifier() val specifier = MatchAllNetworkSpecifier()
val discoverySession = Mockito.mock(DiscoverySession::class.java) val discoverySession = Mockito.mock(DiscoverySession::class.java)
val peerHandle = Mockito.mock(PeerHandle::class.java) val peerHandle = Mockito.mock(PeerHandle::class.java)
val wifiAwareNetworkSpecifier = WifiAwareNetworkSpecifier.Builder(discoverySession, val wifiAwareNetworkSpecifier = WifiAwareNetworkSpecifier.Builder(discoverySession,
peerHandle).build() peerHandle).build()
specifier.satisfiedBy(wifiAwareNetworkSpecifier) specifier.canBeSatisfiedBy(wifiAwareNetworkSpecifier)
} }
} }