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

Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4310decabc5f997e79a736b82581b8b47ed8b0d
This commit is contained in:
Lorenzo Colitti
2021-02-19 08:27:04 +00:00
committed by Automerger Merge Worker
parent 358e0966fc be4a0e84ef
commit 9e072f09a0
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -28,6 +28,7 @@ import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkPolicyManager;
import android.net.Uri;
import android.net.VpnManager;
import android.net.wifi.WifiManager;
import android.net.wifi.p2p.WifiP2pManager;
import android.os.AsyncTask;
@@ -93,6 +94,11 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
connectivityManager.factoryReset();
}
VpnManager vpnManager = mContext.getSystemService(VpnManager.class);
if (vpnManager != null) {
vpnManager.factoryReset();
}
WifiManager wifiManager = (WifiManager)
mContext.getSystemService(Context.WIFI_SERVICE);
if (wifiManager != null) {