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

Rename satisfiedBy to canBeSatisfiedBy for MatchAllNetworkSpecifier

Browse Source 
MatchAllNetworkSpecifier is a subclass of NetworkSpecifer. The method
satisfiedBy should be renamed to canBeSatisfiedBy together with other
subclass of NetworkSpecifer in b/152238712.

Add annotation @Overide for the method to make sure it will not get
ignored when refactor in the future.

Bug: 154956584
Test: atest android.net.MatchAllNetworkSpecifierTest
Original-Change: https://android-review.googlesource.com/1295946
Merged-In: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7
Change-Id: Ibe32fd50fae43aa635c1c0dad66eaea82011c8b7
This commit is contained in:
Rambo Wang
2020-04-30 15:19:24 +00:00
committed by Lucas Lin
parent 97735e73db
commit b72c2c4547
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)
} }
} }