aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 00:07:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 00:07:41 +0000
commit3e39a2bdb8bd58087f17b2f3afb30537de8a5e9e (patch)
tree6d4f6ce6851c7b72ca1918f437199696ec229df3
parent863882d6f551f50877d716de5b7125ddf6945960 (diff)
parent95e5feb9cfccf2522a76259d546fd4d290228af3 (diff)
downloadCar-3e39a2bdb8bd58087f17b2f3afb30537de8a5e9e.tar.gz
Merge "Update setVpnPackageAuthorization call with VPN type" am: 95e5feb9cf
Change-Id: I393f28f36b8a134538288f86aa5f8fbb43f54235
-rw-r--r--tests/CarDeveloperOptions/src/com/android/car/developeroptions/vpn2/AppDialogFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/vpn2/AppDialogFragment.java b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/vpn2/AppDialogFragment.java
index 011760ee64..472ea182cb 100644
--- a/tests/CarDeveloperOptions/src/com/android/car/developeroptions/vpn2/AppDialogFragment.java
+++ b/tests/CarDeveloperOptions/src/com/android/car/developeroptions/vpn2/AppDialogFragment.java
@@ -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 +