From fcce2cb0b621a1aa588b8c0c25f8c971dabcdb48 Mon Sep 17 00:00:00 2001
From: lesl <lesl@google.com>
Date: Wed, 18 Dec 2019 19:19:09 +0800
Subject: wifi: remove softap restore method since new API supported in R

New API: retrieveSoftApBackupData/restoreSoftApBackupData

Bug: 144368124
Test: atest frameworks/opt/net/wifi/tests/wifitests/
Change-Id: Ia8c9851a04e3cad79d4f1b3e5647bd72d7b97680
---
 .../server/wifi/SoftApBackupRestoreTest.java       | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java b/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java
index 56d856081..9a275fe32 100644
--- a/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.*;
 
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiConfiguration;
+import android.util.BackupUtils;
 
 import androidx.test.filters.SmallTest;
 
@@ -31,6 +32,10 @@ import com.android.server.wifi.util.ApConfigUtil;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
 /**
  * Unit tests for {@link com.android.server.wifi.SoftApBackupRestore}.
  */
@@ -38,12 +43,30 @@ import org.junit.Test;
 public class SoftApBackupRestoreTest extends WifiBaseTest {
 
     private SoftApBackupRestore mSoftApBackupRestore;
+    private static final int LAST_WIFICOFIGURATION_BACKUP_VERSION = 3;
 
     @Before
     public void setUp() throws Exception {
         mSoftApBackupRestore = new SoftApBackupRestore();
     }
 
+    /**
+     * Copy from WifiConfiguration for test backup/restore is backward compatible.
+     */
+    private byte[] getBytesForBackup(WifiConfiguration wificonfig) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        DataOutputStream out = new DataOutputStream(baos);
+
+        out.writeInt(LAST_WIFICOFIGURATION_BACKUP_VERSION);
+        BackupUtils.writeString(out, wificonfig.SSID);
+        out.writeInt(wificonfig.apBand);
+        out.writeInt(wificonfig.apChannel);
+        BackupUtils.writeString(out, wificonfig.preSharedKey);
+        out.writeInt(wificonfig.getAuthType());
+        out.writeBoolean(wificonfig.hiddenSSID);
+        return baos.toByteArray();
+    }
+
     /**
      * Verifies that the serialization/de-serialization for wpa2 softap config works.
      */
@@ -93,7 +116,7 @@ public class SoftApBackupRestoreTest extends WifiBaseTest {
         wifiConfig.hiddenSSID = true;
         wifiConfig.preSharedKey = "test_pwd";
         wifiConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA2_PSK);
-        byte[] data = wifiConfig.getBytesForBackup();
+        byte[] data = getBytesForBackup(wifiConfig);
         SoftApConfiguration restoredConfig =
                 mSoftApBackupRestore.retrieveSoftApConfigurationFromBackupData(data);
 
-- 
cgit v1.2.3