Merge "WifiBackupRestore: Collect legacy ip config data for debugging" into rvc-dev

1 files changed, 8 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiBackupRestore.java b/service/java/com/android/server/wifi/WifiBackupRestore.java
index 8d86c365f..c55236ee4 100644
--- a/service/java/com/android/server/wifi/WifiBackupRestore.java
+++ b/service/java/com/android/server/wifi/WifiBackupRestore.java
@@ -128,6 +128,7 @@ public class WifiBackupRestore {
     private byte[] mDebugLastBackupDataRetrieved;
     private byte[] mDebugLastBackupDataRestored;
     private byte[] mDebugLastSupplicantBackupDataRestored;
+    private byte[] mDebugLastIpConfigBackupDataRestored;
 
     public WifiBackupRestore(WifiPermissionsUtil wifiPermissionsUtil) {
         mWifiPermissionsUtil = wifiPermissionsUtil;
@@ -367,6 +368,7 @@ public class WifiBackupRestore {
 
         if (mVerboseLoggingEnabled) {
             mDebugLastSupplicantBackupDataRestored = supplicantData;
+            mDebugLastIpConfigBackupDataRestored = ipConfigData;
         }
 
         SupplicantBackupMigration.SupplicantNetworks supplicantNetworks =
@@ -419,6 +421,7 @@ public class WifiBackupRestore {
             mDebugLastBackupDataRetrieved = null;
             mDebugLastBackupDataRestored = null;
             mDebugLastSupplicantBackupDataRestored = null;
+            mDebugLastIpConfigBackupDataRestored = null;
         }
     }
 
@@ -440,10 +443,14 @@ public class WifiBackupRestore {
                     + createLogFromBackupData(mDebugLastBackupDataRestored));
         }
         if (mDebugLastSupplicantBackupDataRestored != null) {
-            pw.println("Last old backup data restored: "
+            pw.println("Last old supplicant backup data restored: "
                     + SupplicantBackupMigration.createLogFromBackupData(
                             mDebugLastSupplicantBackupDataRestored));
         }
+        if (mDebugLastIpConfigBackupDataRestored != null) {
+            pw.println("Last old ipconfig backup data restored: "
+                    + mDebugLastIpConfigBackupDataRestored);
+        }
     }
 
     /**