WifiConfigStore: Remove IpConfigStore inheritance

Move IpconfigStore instance to be a member of the WifiConfigStore and
create a new DelayedDiskWriter for writing the other configurations.

BUG: 27293150
Change-Id: I76654d49848c417599996b0a8b510ff2b04a3d4a
TEST: `runtest frameworks-wifi`

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
index 67370de65..668231938 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
@@ -182,7 +182,7 @@ public class WifiConfigStoreTest {
                 stream.close();
                 mNetworkHistory = buffer.toByteArray();
             }}).when(mWriter).write(anyString(), (DelayedDiskWrite.Writer) anyObject());
-        final Field writerField = WifiConfigStore.class.getSuperclass().getDeclaredField("mWriter");
+        final Field writerField = WifiConfigStore.class.getDeclaredField("mWriter");
         writerField.setAccessible(true);
         writerField.set(mConfigStore, mWriter);