diff options
| author | Roshan Pius <rpius@google.com> | 2016-11-12 00:36:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-12 00:36:04 +0000 |
| commit | cc441d0d50cf3c1c6deeb7b143c1c58cb761c14d (patch) | |
| tree | f993f3238c58176a0ed9cd213069fcff86e74352 | |
| parent | 5df1c07e161cfa6176c3b1f5a708562cd35e2c58 (diff) | |
| parent | b2c8d28046e96c4506482e030c6320cda6db8f30 (diff) | |
WifiConfigManager: Remove legacy store files
am: b2c8d28046
Change-Id: Id1a07c13940d33d41d7c07bea4c336f7ee9db15e
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 3 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index a15a99388..812a3031d 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2419,8 +2419,7 @@ public class WifiConfigManager { if (!saveToStore(true)) { return false; } - // TODO: Remove the legacy store files - // mWifiConfigStoreLegacy.removeStores(); + mWifiConfigStoreLegacy.removeStores(); Log.d(TAG, "Migration from legacy store completed"); } return true; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 426e84444..b96d4e954 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -1911,6 +1911,7 @@ public class WifiConfigManagerTest { verify(mWifiConfigStore, never()).read(); verify(mWifiConfigStoreLegacy).read(); + verify(mWifiConfigStoreLegacy).removeStores(); List<WifiConfiguration> retrievedNetworks = mWifiConfigManager.getConfiguredNetworksWithPasswords(); |