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

Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds"

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-22 04:43:26 +00:00
committed by Gerrit Code Review
parent 82efa81cd7 3c409e8ce7
commit 4995a0bbaa
6 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -12314,12 +12314,12 @@ public class ConnectivityServiceTest {
public void testSubIdsClearedWithoutNetworkFactoryPermission() throws Exception {
mServiceContext.setPermission(NETWORK_FACTORY, PERMISSION_DENIED);
final NetworkCapabilities nc = new NetworkCapabilities();
nc.setSubIds(Collections.singleton(Process.myUid()));
nc.setSubscriptionIds(Collections.singleton(Process.myUid()));
final NetworkCapabilities result =
mService.networkCapabilitiesRestrictedForCallerPermissions(
nc, Process.myPid(), Process.myUid());
assertTrue(result.getSubIds().isEmpty());
assertTrue(result.getSubscriptionIds().isEmpty());
}
@Test
@@ -12328,17 +12328,17 @@ public class ConnectivityServiceTest {
final Set<Integer> subIds = Collections.singleton(Process.myUid());
final NetworkCapabilities nc = new NetworkCapabilities();
nc.setSubIds(subIds);
nc.setSubscriptionIds(subIds);
final NetworkCapabilities result =
mService.networkCapabilitiesRestrictedForCallerPermissions(
nc, Process.myPid(), Process.myUid());
assertEquals(subIds, result.getSubIds());
assertEquals(subIds, result.getSubscriptionIds());
}
private NetworkRequest getRequestWithSubIds() {
return new NetworkRequest.Builder()
.setSubIds(Collections.singleton(Process.myUid()))
.setSubscriptionIds(Collections.singleton(Process.myUid()))
.build();
}