Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add in sandbox UIDs when configuring VPN." into tm-dev am: a8455d088b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884328

Change-Id: I40769c3fa54ffd3d2d37574c116ae674ca73c98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-12 17:11:00 +00:00
committed by Automerger Merge Worker
parent 5fb12d298f a8455d088b
commit e3b18ac1c3
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1533,11 +1533,17 @@ public class Vpn {
} }
// Note: Return type guarantees results are deduped and sorted, which callers require. // Note: Return type guarantees results are deduped and sorted, which callers require.
// This method also adds the SDK sandbox UIDs corresponding to the applications by default,
// since apps are generally not aware of them, yet they should follow the VPN configuration
// of the app they belong to.
private SortedSet<Integer> getAppsUids(List<String> packageNames, int userId) { private SortedSet<Integer> getAppsUids(List<String> packageNames, int userId) {
SortedSet<Integer> uids = new TreeSet<>(); SortedSet<Integer> uids = new TreeSet<>();
for (String app : packageNames) { for (String app : packageNames) {
int uid = getAppUid(app, userId); int uid = getAppUid(app, userId);
if (uid != -1) uids.add(uid); if (uid != -1) uids.add(uid);
if (Process.isApplicationUid(uid)) {
uids.add(Process.toSdkSandboxUid(uid));
}
} }
return uids; return uids;
} }