Merge "Clear binder identity before calling PackageManager API" into rvc-dev

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