Fixed that phone service crashed during boot up issue.
Jack Yu [Fri, 10 Jul 2015 18:04:11 +0000 (11:04 -0700)]
bug: 22357173
Change-Id: I3b76a74c698e22c887b3482a3bdcbc34982ec658

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

index 4fb37e2..341c469 100644 (file)
@@ -2482,7 +2482,7 @@ public final class DcTracker extends DcTrackerBase {
                 }
             }
         } else {
-            loge("mAllApnSettings is empty!");
+            loge("mAllApnSettings is null!");
         }
         if (DBG) log("buildWaitingApns: X apnList=" + apnList);
         return apnList;
@@ -2519,8 +2519,8 @@ public final class DcTracker extends DcTrackerBase {
     }
 
     private ApnSetting getPreferredApn() {
-        if (mAllApnSettings.isEmpty()) {
-            log("getPreferredApn: X not found mAllApnSettings.isEmpty");
+        if (mAllApnSettings == null || mAllApnSettings.isEmpty()) {
+            log("getPreferredApn: mAllApnSettings is " + ((mAllApnSettings == null)?"null":"empty"));
             return null;
         }