Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1dd0953 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Add SDK level check to adding sandbox UIDs." am: e202bd7d am: d0091f2a" into tm-dev-plus-aosp am: a1979fa8 am: 3fdfa275

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



Change-Id: I8626c88dbc6ab0f809a5501e02710c0e9444508e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6483354d 3fdfa275

services/core/java/com/android/server/connectivity/Vpn.java

+3 −1
Original line number Diff line number Diff line
@@ -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));

            }

        }