commit 26b05f7dc35f47bc62bf9630df288ae2d6e4657e
author Wink Saville <wink@google.com> Tue Apr 12 17:03:29 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 12 17:03:29 2011 -0700
tree 4c1504cf9515d8ab032f2c50642e6555cc89e976
parent 3495d08c40c758df1e19c2bd1a8d68d73ed320bf
parent 05be003f7f3dd758c44c2cdb3e7aa638d8daa446

am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
  Fix occasional phone app crash

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 24c31c7..8c2851a78 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 @@
             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);
             }