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

Commit 18ed4cd3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add in sandbox UIDs when configuring VPN." into tm-dev am: a8455d08 am: e3b18ac1 

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



Change-Id: Ia1019d4f9ae7d02efb226b1d4c6bc47df306b632
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f59598c e3b18ac1

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

+6 −0
Original line number Diff line number Diff line
@@ -1533,11 +1533,17 @@ public class Vpn { 
    }



    // Note: Return type guarantees results are deduped and sorted, which callers require.

    // This method also adds the SDK sandbox UIDs corresponding to the applications by default,

    // since apps are generally not aware of them, yet they should follow the VPN configuration

    // of the app they belong to.

    private SortedSet<Integer> getAppsUids(List<String> packageNames, int userId) {

        SortedSet<Integer> uids = new TreeSet<>();

        for (String app : packageNames) {

            int uid = getAppUid(app, userId);

            if (uid != -1) uids.add(uid);

            if (Process.isApplicationUid(uid)) {

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

            }

        }

        return uids;

    }