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

Commit 5e347ed6 authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Add in sandbox UIDs when configuring VPN." am: 1cdbdd90 am: 3396afc6 

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



Change-Id: Iebcec9c693af390f1cc8167c6b252389a19ccb28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f111888 3396afc6

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

+6 −0
Original line number Diff line number Diff line
@@ -1621,11 +1621,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;

    }