Merge "WifiApConfigStore: Use the new env method to get location of legacy file"

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
index 9c10cdf3d..63290db38 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
@@ -135,16 +135,16 @@ public class WifiApConfigStoreTest extends WifiBaseTest {
     /**
      * Helper method to create and verify actions for the ApConfigStore used in the following tests.
      */
-    private WifiApConfigStore createWifiApConfigStore(String legacyFilePath) {
+    private WifiApConfigStore createWifiApConfigStore(File legacyFile) {
         WifiApConfigStore store;
-        if (legacyFilePath == null) {
+        if (legacyFile == null) {
             store = new WifiApConfigStore(
                     mContext, mWifiInjector, mHandler, mBackupManagerProxy,
                     mWifiConfigStore, mWifiConfigManager, mActiveModeWarden);
         } else {
             store = new WifiApConfigStore(
                     mContext, mWifiInjector, mHandler, mBackupManagerProxy,
-                    mWifiConfigStore, mWifiConfigManager, mActiveModeWarden, legacyFilePath);
+                    mWifiConfigStore, mWifiConfigManager, mActiveModeWarden, legacyFile);
         }
 
         verify(mWifiConfigStore).registerStoreData(any());
@@ -325,7 +325,7 @@ public class WifiApConfigStoreTest extends WifiBaseTest {
         assertWifiConfigurationEqualSoftApConfiguration(backupConfig, expectedConfig);
 
         writeLegacyApConfigFile(backupConfig);
-        WifiApConfigStore store = createWifiApConfigStore(mLegacyApConfigFile.getPath());
+        WifiApConfigStore store = createWifiApConfigStore(mLegacyApConfigFile);
         verify(mWifiConfigManager).saveToStore(true);
         verify(mBackupManagerProxy).notifyDataChanged();
         verifyApConfig(expectedConfig, store.getApConfiguration());