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

Merge "Add SDK level check to adding sandbox UIDs." am: e202bd7dcb

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

Change-Id: Idcffcd8ba77bc5d9012efdaa7ecaf32e7c0bb032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Martijn Coenen
2022-05-13 09:30:03 +00:00
committed by Automerger Merge Worker
parent 9493af0ea4 e202bd7dcb
commit d0091f2a1c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1629,7 +1629,9 @@ public class Vpn {
for (String app : packageNames) {
int uid = getAppUid(app, userId);
if (uid != -1) uids.add(uid);
if (Process.isApplicationUid(uid)) {
// TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from
// ConnectivityServiceTest.
if (Process.isApplicationUid(uid) && SdkLevel.isAtLeastT()) {
uids.add(Process.toSdkSandboxUid(uid));
}
}