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

Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-06-15 14:31:16 -07:00
committed by Android (Google) Code Review
parent 5af3405f0d 0e765f8b73
commit 1146bddf92
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,7 +228,6 @@ public abstract class DataConnection extends StateMachine {
mId = id; mId = id;
mRetryMgr = rm; mRetryMgr = rm;
this.cid = -1; this.cid = -1;
clearSettings();
setDbg(false); setDbg(false);
addState(mDefaultState); addState(mDefaultState);
@@ -313,7 +312,6 @@ public abstract class DataConnection extends StateMachine {
AsyncResult.forMessage(msg); AsyncResult.forMessage(msg);
msg.sendToTarget(); msg.sendToTarget();
} }
clearSettings();
if (DBG) log("NotifyDisconnectCompleted DisconnectParams=" + dp); if (DBG) log("NotifyDisconnectCompleted DisconnectParams=" + dp);
} }
@@ -632,7 +630,6 @@ public abstract class DataConnection extends StateMachine {
} }
case DataConnectionAc.REQ_RESET: case DataConnectionAc.REQ_RESET:
if (VDBG) log("DcDefaultState: msg.what=REQ_RESET"); if (VDBG) log("DcDefaultState: msg.what=REQ_RESET");
clearSettings();
mAc.replyToMessage(msg, DataConnectionAc.RSP_RESET); mAc.replyToMessage(msg, DataConnectionAc.RSP_RESET);
transitionTo(mInactiveState); transitionTo(mInactiveState);
break; break;
@@ -718,6 +715,7 @@ public abstract class DataConnection extends StateMachine {
if (VDBG) log("DcInactiveState: enter notifyDisconnectCompleted"); if (VDBG) log("DcInactiveState: enter notifyDisconnectCompleted");
notifyDisconnectCompleted(mDisconnectParams); notifyDisconnectCompleted(mDisconnectParams);
} }
clearSettings();
} }
@Override @Override