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

Commit 8ef20ea9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "platform-vpn-user-consent" am: e9b3f330 am: 5437a805 

Change-Id: I82d301a58cb8ea8234f2d4924123a07a3f02b784
parents 00e44f60 5437a805

src/com/android/settings/vpn2/AppDialogFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.DialogInterface;

import android.content.pm.PackageInfo;

import android.net.IConnectivityManager;

import android.net.VpnManager;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -145,7 +146,8 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App 
        }

        final int userId = getUserId();

        try {

            mService.setVpnPackageAuthorization(mPackageInfo.packageName, userId, false);

            mService.setVpnPackageAuthorization(

                    mPackageInfo.packageName, userId, VpnManager.TYPE_VPN_NONE);

            onDisconnect(dialog);

        } catch (RemoteException e) {

            Log.e(TAG, "Failed to forget authorization of " + mPackageInfo.packageName +