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

[VCN19] Rename get/setSubIds to get/setSubscriptionIds

Browse Source 
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Merged-In: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
  (cherry-picked from ag/14198665)
This commit is contained in:
junyulai
2021-04-14 23:33:31 +08:00
parent 6cab3df7dc
commit 2217becf8d
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

@@ -12310,12 +12310,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
@@ -12324,17 +12324,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();
}