diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-12-01 09:42:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-01 09:42:13 -0800 |
| commit | 22d5d7b6e865e36eb3e057bc27d339d56c292d20 (patch) | |
| tree | 0b519375a6a1d6ca34edfaa66debb9ffc6690192 /telephony | |
| parent | 90ea4c4d30ccafb51e024ab3c34a4655d06eec4c (diff) | |
| parent | 645c80654ff55f129a7d87873ee2ad7cf3350678 (diff) | |
| download | frameworks_base-22d5d7b6e865e36eb3e057bc27d339d56c292d20.zip frameworks_base-22d5d7b6e865e36eb3e057bc27d339d56c292d20.tar.gz frameworks_base-22d5d7b6e865e36eb3e057bc27d339d56c292d20.tar.bz2 | |
Merge "Fix state synchronization problem." into ics-mr1
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnection.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java index 636646e..4619899 100644 --- a/telephony/java/com/android/internal/telephony/DataConnection.java +++ b/telephony/java/com/android/internal/telephony/DataConnection.java @@ -699,8 +699,10 @@ public abstract class DataConnection extends StateMachine { break; case EVENT_DISCONNECT: - if (DBG) log("DcDefaultState: msg.what=EVENT_DISCONNECT"); - notifyDisconnectCompleted((DisconnectParams) msg.obj); + if (DBG) { + log("DcDefaultState deferring msg.what=EVENT_DISCONNECT" + mRefCount); + } + deferMessage(msg); break; case EVENT_RIL_CONNECTED: @@ -807,6 +809,12 @@ public abstract class DataConnection extends StateMachine { retVal = HANDLED; break; + case EVENT_DISCONNECT: + if (DBG) log("DcInactiveState: msg.what=EVENT_DISCONNECT"); + notifyDisconnectCompleted((DisconnectParams)msg.obj); + retVal = HANDLED; + break; + default: if (VDBG) { log("DcInactiveState nothandled msg.what=0x" + @@ -831,13 +839,6 @@ public abstract class DataConnection extends StateMachine { ConnectionParams cp; switch (msg.what) { - case EVENT_DISCONNECT: - if (DBG) log("DcActivatingState deferring msg.what=EVENT_DISCONNECT" - + mRefCount); - deferMessage(msg); - retVal = HANDLED; - break; - case EVENT_CONNECT: if (DBG) log("DcActivatingState deferring msg.what=EVENT_CONNECT refCount = " + mRefCount); |