diff options
| author | Wink Saville <wink@google.com> | 2011-04-12 17:00:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-12 17:00:57 -0700 |
| commit | 05be003f7f3dd758c44c2cdb3e7aa638d8daa446 (patch) | |
| tree | 6272c899846daedd68899ff28b4a722c0f2ef492 /telephony | |
| parent | bf3452f36c768808873e5428e3594c7eaec0a10c (diff) | |
| parent | c078a4362791cec3976c4312d3f7e0e96b3487bf (diff) | |
| download | frameworks_base-05be003f7f3dd758c44c2cdb3e7aa638d8daa446.zip frameworks_base-05be003f7f3dd758c44c2cdb3e7aa638d8daa446.tar.gz frameworks_base-05be003f7f3dd758c44c2cdb3e7aa638d8daa446.tar.bz2 | |
am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
Fix occasional phone app crash
Diffstat (limited to 'telephony')
| -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); } |