Fix occasional phone app crash

bug #4263503

if GsmDCT is just initialized and LTE/GPRS attach happens
before SIM is completely loaded, phone app would crash
as there is no DataConnection associated with ApnContext.

Change-Id: Ie8007c718c3f68a7b3e42154e60e5b25631ec3c8

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 24c31c7..8c2851a 100644 (file)
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -569,7 +569,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
             if (defaultApnContext != null) {
                 if (defaultApnContext.getState() == State.FAILED) {
                     cleanUpConnection(false, defaultApnContext);
-                    defaultApnContext.getDataConnection().resetRetryCount();
+                    if (defaultApnContext.getDataConnection() != null) {
+                        defaultApnContext.getDataConnection().resetRetryCount();
+                    }
                 }
                 trySetupData(Phone.REASON_GPRS_ATTACHED, Phone.APN_TYPE_DEFAULT);
             }