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

Commit 0cb02dc1 authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Add SDK level check to adding sandbox UIDs. am: 512a4fe7 

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



Change-Id: Ic1b1143210e02e1f9ee14810753d043ff96d0b63
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48eeb3b0 512a4fe7

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -1646,7 +1646,9 @@ public class Vpn { 
        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)) {

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

                uids.add(Process.toSdkSandboxUid(uid));

            }

            }

        }

        }