commit f17dec635141a16b68ab4980c118d49ec5ae11c0
author Wink Saville <wink@google.com> Wed Oct 15 17:08:46 2014 -0700
committer Wink Saville <wink@google.com> Wed Oct 15 17:08:46 2014 -0700
tree 42a57b40823fb766cbf0ecdb00a1cf186b507824
parent 7b960c8adc35113c6eb3fad6cdfe32c2169d380b

Fix an NPE in SubscriptionController.dump

Bug: 17945275
Change-Id: I076112ede5fd224284c23078b321fd282d0dffe0

src/java/com/android/internal/telephony/SubscriptionController.java

diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 68bc62d..cc60a3e 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -1388,14 +1388,26 @@
         pw.flush();
         pw.println("++++++++++++++++++++++++++++++++");
 
-        for (SubInfoRecord entry : getActiveSubInfoList()) {
-            pw.println(" ActiveSubInfoList:" + entry.toString());
+        List<SubInfoRecord> sirl = getActiveSubInfoList();
+        if (sirl != null) {
+            pw.println(" ActiveSubInfoList:");
+            for (SubInfoRecord entry : sirl) {
+                pw.println("  " + entry.toString());
+            }
+        } else {
+            pw.println(" ActiveSubInfoList: is null");
         }
         pw.flush();
         pw.println("++++++++++++++++++++++++++++++++");
 
-        for (SubInfoRecord entry : getAllSubInfoList()) {
-            pw.println(" AllSubInfoList:" + entry.toString());
+        sirl = getAllSubInfoList();
+        if (sirl != null) {
+            pw.println(" AllSubInfoList:");
+            for (SubInfoRecord entry : sirl) {
+                pw.println("  " + entry.toString());
+            }
+        } else {
+            pw.println(" AllSubInfoList: is null");
         }
         pw.flush();
         pw.println("++++++++++++++++++++++++++++++++");