3 files changed, 16 insertions, 15 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl
index 6e6d6f6..0e888e8 100644
--- a/wifi/java/android/net/wifi/IWifiManager.aidl
+++ b/wifi/java/android/net/wifi/IWifiManager.aidl
@@ -166,5 +166,7 @@ interface IWifiManager
     WifiConnectionStatistics getConnectionStatistics();
 
     void disableEphemeralNetwork(String SSID);
+
+    void factoryReset();
 }
 
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 18f90d8..3205351 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2063,7 +2063,11 @@ public class WifiManager {
                         .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                         .build();
                 mNetworkCallback = new PinningNetworkCallback();
-                sCM.registerNetworkCallback(request, mNetworkCallback);
+                try {
+                    sCM.registerNetworkCallback(request, mNetworkCallback);
+                } catch (SecurityException e) {
+                    Log.d(TAG, "Failed to register network callback", e);
+                }
             }
         }
     }
@@ -2072,7 +2076,11 @@ public class WifiManager {
         initConnectivityManager();
         synchronized (sCM) {
             if (mNetworkCallback != null) {
-                sCM.unregisterNetworkCallback(mNetworkCallback);
+                try {
+                    sCM.unregisterNetworkCallback(mNetworkCallback);
+                } catch (SecurityException e) {
+                    Log.d(TAG, "Failed to unregister network callback", e);
+                }
                 mNetworkCallback = null;
             }
         }
@@ -2791,18 +2799,9 @@ public class WifiManager {
      * @hide
      */
     public void factoryReset() {
-        // Enable wifi
-        setWifiEnabled(true);
-        // Delete all Wifi SSIDs
-        List<WifiConfiguration> networks = getConfiguredNetworks();
-        if (networks != null) {
-            for (WifiConfiguration config : networks) {
-                removeNetwork(config.networkId);
-            }
-            saveConfiguration();
+        try {
+            mService.factoryReset();
+        } catch (RemoteException e) {
         }
-
-        // Turn mobile hotspot off
-        setWifiApEnabled(null, false);
     }
 }
diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java
index cecd738..4ead972 100644
--- a/wifi/java/android/net/wifi/WifiScanner.java
+++ b/wifi/java/android/net/wifi/WifiScanner.java
@@ -722,7 +722,7 @@ public class WifiScanner {
     /* private members and methods */
 
     private static final String TAG = "WifiScanner";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
 
     /* commands for Wifi Service */
     private static final int BASE = Protocol.BASE_WIFI_SCANNER;