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

Merge "Merge "Add SDK level check to adding sandbox UIDs." am: e202bd7dcb am: d0091f2a1c" into tm-dev-plus-aosp am: a1979fa87b am: 3fdfa2752e

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

Change-Id: I8626c88dbc6ab0f809a5501e02710c0e9444508e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-05-13 17:45:14 +00:00
parent 6483354dcd 3fdfa2752e
commit a1dd095375
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));
}
}