diff options
| author | Wink Saville <wink@google.com> | 2011-04-12 16:53:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-12 16:53:54 -0700 |
| commit | c078a4362791cec3976c4312d3f7e0e96b3487bf (patch) | |
| tree | 56219af15ef840d1752eb2e2cf4c92644cee18ac | |
| parent | 34b42b2ded4741e68413d0aa39f3af146629dcec (diff) | |
| parent | 921c9d242587d32f0a264522d67c61de9594d25e (diff) | |
| download | frameworks_base-c078a4362791cec3976c4312d3f7e0e96b3487bf.zip frameworks_base-c078a4362791cec3976c4312d3f7e0e96b3487bf.tar.gz frameworks_base-c078a4362791cec3976c4312d3f7e0e96b3487bf.tar.bz2 | |
Merge "Fix occasional phone app crash" into honeycomb-LTE
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 4 |
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); } |