diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-08 16:22:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-08 16:22:06 -0700 |
| commit | ac9c73ae619aee63f49cf1f845ef5588bd46dce8 (patch) | |
| tree | 1e1939908f42ffce9c5b9f118f7971ebc4d2be23 /telephony | |
| parent | 73ad388aae28213dd3f47bcac1b52c671e3cacc7 (diff) | |
| parent | 6b01e4cdf8b9d9bfebdf58c34091d2c670a4e7d9 (diff) | |
| download | frameworks_base-ac9c73ae619aee63f49cf1f845ef5588bd46dce8.zip frameworks_base-ac9c73ae619aee63f49cf1f845ef5588bd46dce8.tar.gz frameworks_base-ac9c73ae619aee63f49cf1f845ef5588bd46dce8.tar.bz2 | |
Merge "Fix notification of disconnected networks." into honeycomb-LTE
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 53cbad5..ecc29e6 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -1569,13 +1569,16 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { if(DBG) log("EVENT_DISCONNECT_DONE connId=" + connId); if (ar.userObj instanceof ApnContext) { apnContext = (ApnContext) ar.userObj; + } else { + loge("Invalid ar in onDisconnectDone"); + return; } - mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType()); - apnContext.setState(State.IDLE); apnContext.setApnSetting(null); + mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType()); + // if all data connection are gone, check whether Airplane mode request was // pending. if (!isConnected()) { |