diff options
| author | Kazuhiro Ondo <kazuhiro.ondo@motorola.com> | 2011-04-01 16:09:37 -0500 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2011-04-12 14:42:02 -0700 |
| commit | 921c9d242587d32f0a264522d67c61de9594d25e (patch) | |
| tree | 75a6a5faa2fad4dd756de56d8cdc54cbff27de3e /telephony | |
| parent | 87ee132ac5dd99564d4ad8f05631bbb021dbc0b0 (diff) | |
| download | frameworks_base-921c9d242587d32f0a264522d67c61de9594d25e.zip frameworks_base-921c9d242587d32f0a264522d67c61de9594d25e.tar.gz frameworks_base-921c9d242587d32f0a264522d67c61de9594d25e.tar.bz2 | |
Fix occasional phone app crash
bug #4263503
if GsmDCT is just initialized and LTE/GPRS attach happens
before SIM is completely loaded, phone app would crash
as there is no DataConnection associated with ApnContext.
Change-Id: Ie8007c718c3f68a7b3e42154e60e5b25631ec3c8
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); } |