diff options
| author | Stuart Scott <stuartscott@google.com> | 2015-04-02 18:00:02 -0700 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2015-04-20 10:52:35 -0700 |
| commit | f1fb39763d87dabe254b6ed64ac8f20145035bc0 (patch) | |
| tree | 72547ce7ccccfb5c242c6a5fbce3adf9ba401bf9 /wifi/java | |
| parent | 19f1faa376c08edbd2c7e19ad33107e1b9520777 (diff) | |
| download | frameworks_base-f1fb39763d87dabe254b6ed64ac8f20145035bc0.zip frameworks_base-f1fb39763d87dabe254b6ed64ac8f20145035bc0.tar.gz frameworks_base-f1fb39763d87dabe254b6ed64ac8f20145035bc0.tar.bz2 | |
Move factoryReset to service and protect.
bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 15 |
2 files changed, 5 insertions, 12 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..0f7dd61 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -2791,18 +2791,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); } } |