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

Merge "Temporarily change uid to appId" am: 1e4d4001f4 am: 28a6b24430 am: dd1bb19405

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1770606

Change-Id: I463bbd643a0ad423ba6524029d51749810021fbe
This commit is contained in:
Treehugger Robot
2021-07-19 14:30:46 +00:00
committed by Automerger Merge Worker
parent db8421e29d dd1bb19405
commit f247a76a54
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/com/android/server/connectivity/PermissionMonitor.java
View File

@@ -281,7 +281,14 @@ public class PermissionMonitor {
@VisibleForTesting
synchronized void updateUidsAllowedOnRestrictedNetworks(final Set<Integer> uids) {
mUidsAllowedOnRestrictedNetworks.clear();
mUidsAllowedOnRestrictedNetworks.addAll(uids);
// This is necessary for the app id to match in isUidAllowedOnRestrictedNetworks, and will
// grant the permission to all uids associated with the app ID. This is safe even if the app
// is only installed on some users because the uid cannot match some other app – this uid is
// in effect not installed and can't be run.
// TODO (b/192431153): Change appIds back to uids.
for (int uid : uids) {
mUidsAllowedOnRestrictedNetworks.add(UserHandle.getAppId(uid));
}
}
@VisibleForTesting