diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-08 15:52:23 -0700 |
---|---|---|
committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-08 15:52:23 -0700 |
commit | 6b01e4cdf8b9d9bfebdf58c34091d2c670a4e7d9 (patch) | |
tree | cc8803ee6318de9581db8987407acf2fb2b54b46 /telephony | |
parent | 5203a5bc28a5ae432eab236780b2f97bdec71dbf (diff) | |
download | frameworks_base-6b01e4cdf8b9d9bfebdf58c34091d2c670a4e7d9.zip frameworks_base-6b01e4cdf8b9d9bfebdf58c34091d2c670a4e7d9.tar.gz frameworks_base-6b01e4cdf8b9d9bfebdf58c34091d2c670a4e7d9.tar.bz2 |
Fix notification of disconnected networks.
Reorder - set state and then report the state, else we always report disconnecting which
is interpreted as still connected.
Change-Id: I95f5fe9ccee0d7ee9a03f78ae5b614af2ba0860b
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 cfb78d0..24e3fef 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -1572,13 +1572,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()) { |