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 "Create new system API in UserHandle to get uid"

Browse source
This commit is contained in:
Chiachang Wang 2021-02-08 03:56:39 +00:00 • committed by Gerrit Code Review
commit 2173785652
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
services/core/java/com/android/server/connectivity/PermissionMonitor.java
View file

@ -265,7 +265,10 @@ public class PermissionMonitor implements PackageManagerInternal.PackageListObse
for (Entry<Integer, Boolean> app : apps.entrySet()) {
List<Integer> list = app.getValue() ? system : network;
for (int user : users) {
list.add(UserHandle.getUid(user, app.getKey()));
final UserHandle handle = UserHandle.of(user);
if (handle == null) continue;
list.add(UserHandle.getUid(handle, app.getKey()));
}
}
try {
@ -550,7 +553,10 @@ public class PermissionMonitor implements PackageManagerInternal.PackageListObse
for (UidRange range : ranges) {
for (int userId = range.getStartUser(); userId <= range.getEndUser(); userId++) {
for (int appId : appIds) {
final int uid = UserHandle.getUid(userId, appId);
final UserHandle handle = UserHandle.of(userId);
if (handle == null) continue;
final int uid = UserHandle.getUid(handle, appId);
if (range.contains(uid)) {
result.add(uid);
}