Merge "Update setVpnPackageAuthorization call with VPN type"

This commit is contained in:
Benedict Wong
2020-02-04 21:04:01 +00:00
committed by Android (Google) Code Review

View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.VpnManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
@@ -145,7 +146,8 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
} }
final int userId = getUserId(); final int userId = getUserId();
try { try {
mService.setVpnPackageAuthorization(mPackageInfo.packageName, userId, false); mService.setVpnPackageAuthorization(
mPackageInfo.packageName, userId, VpnManager.TYPE_VPN_NONE);
onDisconnect(dialog); onDisconnect(dialog);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Failed to forget authorization of " + mPackageInfo.packageName + Log.e(TAG, "Failed to forget authorization of " + mPackageInfo.packageName +