Merge "Enable multiple active Ethernet interfaces" am: db018901eb am: 0c66f907ab

am: 2e96d95357

Change-Id: Ibe7d58ef11f2b71be608e11d46c6585a0f05babb

1 files changed, 5 insertions, 3 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
index 6e7df4ee9..aa99829b6 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
@@ -856,12 +856,14 @@ public class WifiBackupRestoreTest {
     private byte[] createIpConfBackupData(List<WifiConfiguration> configurations) {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         DataOutputStream out = new DataOutputStream(bos);
+        final int configStoreVersion = 2;
         try {
             // write version first.
-            out.writeInt(2);
+            out.writeInt(configStoreVersion);
             for (WifiConfiguration configuration : configurations) {
-                IpConfigStore.writeConfig(out, configuration.configKey().hashCode(),
-                        configuration.getIpConfiguration());
+                // TODO: store configKey as a string instead of calculating its hash
+                IpConfigStore.writeConfig(out, String.valueOf(configuration.configKey().hashCode()),
+                        configuration.getIpConfiguration(), configStoreVersion);
             }
             out.flush();
             return bos.toByteArray();