Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix state synchronization problem." into ics-mr1

Browse Source
This commit is contained in:
Robert Greenwalt
2011-12-01 09:42:13 -08:00
committed by Android (Google) Code Review
parent 90ea4c4d30 645c80654f
commit 22d5d7b6e8
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
telephony/java/com/android/internal/telephony/DataConnection.java
View File

@@ -699,8 +699,10 @@ public abstract class DataConnection extends StateMachine {
break; break;
case EVENT_DISCONNECT: case EVENT_DISCONNECT:
if (DBG) log("DcDefaultState: msg.what=EVENT_DISCONNECT"); if (DBG) {
notifyDisconnectCompleted((DisconnectParams) msg.obj); log("DcDefaultState deferring msg.what=EVENT_DISCONNECT" + mRefCount);
}
deferMessage(msg);
break; break;
case EVENT_RIL_CONNECTED: case EVENT_RIL_CONNECTED:
@@ -807,6 +809,12 @@ public abstract class DataConnection extends StateMachine {
retVal = HANDLED; retVal = HANDLED;
break; break;
case EVENT_DISCONNECT:
if (DBG) log("DcInactiveState: msg.what=EVENT_DISCONNECT");
notifyDisconnectCompleted((DisconnectParams)msg.obj);
retVal = HANDLED;
break;
default: default:
if (VDBG) { if (VDBG) {
log("DcInactiveState nothandled msg.what=0x" + log("DcInactiveState nothandled msg.what=0x" +
@@ -831,13 +839,6 @@ public abstract class DataConnection extends StateMachine {
ConnectionParams cp; ConnectionParams cp;
switch (msg.what) { switch (msg.what) {
case EVENT_DISCONNECT:
if (DBG) log("DcActivatingState deferring msg.what=EVENT_DISCONNECT"
+ mRefCount);
deferMessage(msg);
retVal = HANDLED;
break;
case EVENT_CONNECT: case EVENT_CONNECT:
if (DBG) log("DcActivatingState deferring msg.what=EVENT_CONNECT refCount = " if (DBG) log("DcActivatingState deferring msg.what=EVENT_CONNECT refCount = "
+ mRefCount); + mRefCount);