Merge "Add dumpsys to help debug Carrier Wi-Fi" into pi-dev am: 0a5ff7a2f1

am: 9341b1ef13

Change-Id: I6d64edebb1763da8c4d6c7ee0cc2b564e83a642c

1 files changed, 4 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/CarrierNetworkConfig.java b/service/java/com/android/server/wifi/CarrierNetworkConfig.java
index 78dbe3a0d..cf39e0a7b 100644
--- a/service/java/com/android/server/wifi/CarrierNetworkConfig.java
+++ b/service/java/com/android/server/wifi/CarrierNetworkConfig.java
@@ -59,6 +59,7 @@ public class CarrierNetworkConfig {
 
     private final Map<String, NetworkInfo> mCarrierNetworkMap;
     private boolean mIsCarrierImsiEncryptionInfoAvailable = false;
+    private ImsiEncryptionInfo mLastImsiEncryptionInfo = null; // used for dumpsys only
 
     /**
      * Enable/disable verbose logging.
@@ -137,9 +138,9 @@ public class CarrierNetworkConfig {
             return false;
         }
         try {
-            ImsiEncryptionInfo imsiEncryptionInfo = telephonyManager
+            mLastImsiEncryptionInfo = telephonyManager
                     .getCarrierInfoForImsiEncryption(TelephonyManager.KEY_TYPE_WLAN);
-            if (imsiEncryptionInfo == null) {
+            if (mLastImsiEncryptionInfo == null) {
                 return false;
             }
         } catch (RuntimeException e) {
@@ -280,5 +281,6 @@ public class CarrierNetworkConfig {
         pw.println("mCarrierNetworkMap=" + mCarrierNetworkMap);
         pw.println("mIsCarrierImsiEncryptionInfoAvailable="
                 + mIsCarrierImsiEncryptionInfoAvailable);
+        pw.println("mLastImsiEncryptionInfo=" + mLastImsiEncryptionInfo);
     }
 }