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

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
commit 935946812a
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

@ -1948,7 +1948,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;
@ -5763,7 +5763,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
mAppOpsManager.checkPackage(callerUid, callerPackageName);
if (!nc.getSubIds().isEmpty()) {
if (!nc.getSubscriptionIds().isEmpty()) {
enforceNetworkFactoryPermission();
}
}