diff options
| author | Wink Saville <wink@google.com> | 2011-06-15 14:31:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-15 14:31:16 -0700 |
| commit | 1146bddf92fc91dad384bdaea740f9472bebd911 (patch) | |
| tree | ab53500b757705aa9b046cfcb0a3bc25166c93ce /telephony | |
| parent | 5af3405f0d24c853bd10eb239c081e31972d3e1d (diff) | |
| parent | 0e765f8b731540e4645b7b727fa8bcda2f4f9dc8 (diff) | |
| download | frameworks_base-1146bddf92fc91dad384bdaea740f9472bebd911.zip frameworks_base-1146bddf92fc91dad384bdaea740f9472bebd911.tar.gz frameworks_base-1146bddf92fc91dad384bdaea740f9472bebd911.tar.bz2 | |
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnection.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java index c21a96a..5c030fd 100644 --- a/telephony/java/com/android/internal/telephony/DataConnection.java +++ b/telephony/java/com/android/internal/telephony/DataConnection.java @@ -228,7 +228,6 @@ public abstract class DataConnection extends StateMachine { mId = id; mRetryMgr = rm; this.cid = -1; - clearSettings(); setDbg(false); addState(mDefaultState); @@ -313,7 +312,6 @@ public abstract class DataConnection extends StateMachine { AsyncResult.forMessage(msg); msg.sendToTarget(); } - clearSettings(); if (DBG) log("NotifyDisconnectCompleted DisconnectParams=" + dp); } @@ -632,7 +630,6 @@ public abstract class DataConnection extends StateMachine { } case DataConnectionAc.REQ_RESET: if (VDBG) log("DcDefaultState: msg.what=REQ_RESET"); - clearSettings(); mAc.replyToMessage(msg, DataConnectionAc.RSP_RESET); transitionTo(mInactiveState); break; @@ -718,6 +715,7 @@ public abstract class DataConnection extends StateMachine { if (VDBG) log("DcInactiveState: enter notifyDisconnectCompleted"); notifyDisconnectCompleted(mDisconnectParams); } + clearSettings(); } @Override |