joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests 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
commit 2217becf8d
1 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View file

@ -1907,7 +1907,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
newNc.setAdministratorUids(new int[0]);
if (!checkAnyPermissionOf(
callerPid, callerUid, android.Manifest.permission.NETWORK_FACTORY)) {
newNc.setSubIds(Collections.emptySet());
newNc.setSubscriptionIds(Collections.emptySet());
}
return newNc;
@ -5722,7 +5722,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
mAppOpsManager.checkPackage(callerUid, callerPackageName);
if (!nc.getSubIds().isEmpty()) {
if (!nc.getSubscriptionIds().isEmpty()) {
enforceNetworkFactoryPermission();
}
}