Enable multiple active Ethernet interfaces

Fix WifiBackupRestore tests as now IpConfigStore uses string keys as
opposed to int

Bug: 72526879

Test: runtest -x frameworks/opt/net/wifi
Change-Id: I7ed85c21f0799b4c35f95436bd625a315b38a38e

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 58b8d394b..34d75b22e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
@@ -775,12 +775,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();