PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e am: 5437a80536

Browse Source 
Change-Id: I82d301a58cb8ea8234f2d4924123a07a3f02b784
This commit is contained in:
Automerger Merge Worker
2020-02-05 00:24:12 +00:00
parent 00e44f608c 5437a80536
commit 8ef20ea9c5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/vpn2/AppDialogFragment.java
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 +