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

Commit 20e78088 authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ibd480b2277f0727c921843ddb0ff80679d737583
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 772ea594 d0091f2a

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));

            }

        }