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

Commit 6f56195b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Clear binder identity before calling PackageManager API"

parents d1edb37a a3b6258e

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

+8 −8
Original line number Diff line number Diff line
@@ -951,18 +951,18 @@ public class Vpn { 
                || isVpnServicePreConsented(context, packageName);

    }



    private int getAppUid(String app, int userHandle) {

    private int getAppUid(final String app, final int userHandle) {

        if (VpnConfig.LEGACY_VPN.equals(app)) {

            return Process.myUid();

        }

        PackageManager pm = mContext.getPackageManager();

        int result;

        return Binder.withCleanCallingIdentity(() -> {

            try {

            result = pm.getPackageUidAsUser(app, userHandle);

                return pm.getPackageUidAsUser(app, userHandle);

            } catch (NameNotFoundException e) {

            result = -1;

                return -1;

            }

        return result;

        });

    }



    private boolean doesPackageTargetAtLeastQ(String packageName) {