commit 0790456494461c684fa17b827e37a29de7425c05
author lesl <lesl@google.com> Wed Nov 13 14:17:27 2019 +0800
committer Jimmy Chen <jimmycmchen@google.com> Wed Nov 13 08:39:13 2019 +0000
tree 19f3c7907d1c2fb0ac39e4eb7697bbc9f7425953
parent 23465f560254cc6b5d492b72c4e6a27863b7dd95

wifi: remove saePasswordId from getBytesForBackup

getBytesForBackup is used for Softap. Don't need saePasswordId

Bug: 0
Test: unit test, atest frameworks/base/wifi/tests/

Change-Id: Ia85fa65d6a1f939ebd57c20d4c432b6303107b81

wifi/java/android/net/wifi/WifiConfiguration.java

diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 30c24d3..90343d4 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -2627,7 +2627,6 @@
         out.writeInt(apBand);
         out.writeInt(apChannel);
         BackupUtils.writeString(out, preSharedKey);
-        BackupUtils.writeString(out, saePasswordId);
         out.writeInt(getAuthType());
         out.writeBoolean(hiddenSSID);
         return baos.toByteArray();
@@ -2651,7 +2650,6 @@
         config.apBand = in.readInt();
         config.apChannel = in.readInt();
         config.preSharedKey = BackupUtils.readString(in);
-        config.saePasswordId = BackupUtils.readString(in);
         config.allowedKeyManagement.set(in.readInt());
         if (version >= 3) {
             config.hiddenSSID = in.readBoolean();