Merge "Fix occasional phone app crash" into honeycomb-LTE

2011-04-12 16:53:54 -07:00
parent 34b42b2ded 921c9d2425
commit c078a43627
1 changed files with 3 additions and 1 deletions
--- 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);
            }