1 files changed, 3 insertions, 1 deletions
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
--- 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);
             }