LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restrict match conditions of TelephonyNetworkSpecifier#canBeSatisfied

Browse Source 
TelephonyNetworkSpecifier will now treat null as matching nothing. When
the request specifies a TelephonyNetworkSpecifier while the network does
not, this should not be treated as a match.

Bug: 154703135
Test: atest android.net.TelephonyNetworkSpecifierTest
Change-Id: I329110e929995c9eae6c6ce33b5414777acea1e1
This commit is contained in:
Rambo Wang
2020-04-22 15:24:51 -07:00
parent 89930cbb29
commit 3745c39f98
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/net/java/android/net/TelephonyNetworkSpecifierTest.java
View File

@@ -19,7 +19,10 @@ package android.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import android.net.wifi.WifiNetworkSpecifier;
import android.telephony.SubscriptionManager;
import androidx.test.filters.SmallTest;
@@ -32,6 +35,7 @@ import org.junit.Test;
@SmallTest
public class TelephonyNetworkSpecifierTest {
private static final int TEST_SUBID = 5;
private static final String TEST_SSID = "Test123";
/**
* Validate that IllegalArgumentException will be thrown if build TelephonyNetworkSpecifier
@@ -79,4 +83,31 @@ public class TelephonyNetworkSpecifierTest {
.build();
assertParcelSane(specifier, 1 /* fieldCount */);
}
/**
* Validate the behavior of method canBeSatisfiedBy().
*/
@Test
public void testCanBeSatisfiedBy() {
final TelephonyNetworkSpecifier tns1 = new TelephonyNetworkSpecifier.Builder()
.setSubscriptionId(TEST_SUBID)
.build();
final TelephonyNetworkSpecifier tns2 = new TelephonyNetworkSpecifier.Builder()
.setSubscriptionId(TEST_SUBID)
.build();
final WifiNetworkSpecifier wns = new WifiNetworkSpecifier.Builder()
.setSsid(TEST_SSID)
.build();
final MatchAllNetworkSpecifier mans = new MatchAllNetworkSpecifier();
// Test equality
assertEquals(tns1, tns2);
assertTrue(tns1.canBeSatisfiedBy(tns1));
assertTrue(tns1.canBeSatisfiedBy(tns2));
// Test other edge cases.
assertFalse(tns1.canBeSatisfiedBy(null));
assertFalse(tns1.canBeSatisfiedBy(wns));
assertTrue(tns1.canBeSatisfiedBy(mans));
}
}