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

Commit 3061f7f1 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

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

Merge "Reset VPN settings by calling VpnManager." am: be4a0e84 am: 9e072f09 am: e584f62a am: 5320dbda

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d209c095b6929961747e7506a3d98c5791d20f8
parents a20b01cc 5320dbda

src/com/android/settings/ResetNetworkConfirm.java

+6 −0
Original line number Diff line number Diff line
@@ -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;
@@ -101,6 +102,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) {