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

Merge "Simplify the permission update conditions"

Browse Source
This commit is contained in:
Paul Hu
2021-11-29 05:31:14 +00:00
committed by Gerrit Code Review
parent 6fafdc1548 7bbffbd7d8
commit 5e3ef685ef
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -648,24 +648,17 @@ public class PermissionMonitor {
+ ", nPerm=(" + permissionToString(permission) + "/" + ", nPerm=(" + permissionToString(permission) + "/"
+ permissionToString(currentPermission) + ")" + permissionToString(currentPermission) + ")"
+ ", tPerm=" + permissionToString(trafficPerm)); + ", tPerm=" + permissionToString(trafficPerm));
if (permission == PERMISSION_SYSTEM) { if (permission != currentPermission) {
// An app with this UID still has the SYSTEM permission. final SparseIntArray apps = new SparseIntArray();
// Therefore, this UID must already have the SYSTEM permission. if (permission == PERMISSION_NONE) {
// Nothing to do. mUidToNetworkPerm.delete(uid);
return; apps.put(uid, PERMISSION_NETWORK); // doesn't matter which permission we pick here
} sendUidsNetworkPermission(apps, false);
// If the permissions of this UID have not changed, do nothing. } else {
if (permission == currentPermission) return; mUidToNetworkPerm.put(uid, permission);
apps.put(uid, permission);
final SparseIntArray apps = new SparseIntArray(); sendUidsNetworkPermission(apps, true);
if (permission != PERMISSION_NONE) { }
mUidToNetworkPerm.put(uid, permission);
apps.put(uid, permission);
sendUidsNetworkPermission(apps, true);
} else {
mUidToNetworkPerm.delete(uid);
apps.put(uid, PERMISSION_NETWORK); // doesn't matter which permission we pick here
sendUidsNetworkPermission(apps, false);
} }
} }