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

am 96a98d6: Merge change 402 into donut

Browse Source 
Merge commit '96a98d61d7a8360e7a70c91281a9d608837a6056'

* commit '96a98d61d7a8360e7a70c91281a9d608837a6056':
  remove seemingly now unnecessary workaround path
This commit is contained in:
Android (Google) Code Review
2009-04-29 13:35:23 -07:00
committed by The Android Open Source Project
parent 9a882e3323 96a98d61d7
commit 0d8b8cb4ce
1 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -836,57 +836,38 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
return;
}
if (state == State.CONNECTED) {
// The way things are supposed to work, the PDP list
// should not contain the CID after it disconnects.
// However, the way things really work, sometimes the PDP
// context is still listed with active = false, which
// makes it hard to distinguish an activating context from
// an activated-and-then deactivated one.
if (!pdpStatesHasCID(pdpStates, cidActive)) {
// It looks like the PDP context has deactivated.
// Tear everything down and try to reconnect.
// This is how things are supposed to work:
// The PDP list is supposed to be empty of the CID
// when it disconnects
Log.i(LOG_TAG, "PDP connection has dropped. Reconnecting");
if (state == State.CONNECTED
&& !pdpStatesHasCID(pdpStates, cidActive)) {
// Add an event log when the network drops PDP
int cid = -1;
GsmCellLocation loc = ((GsmCellLocation)phone.getCellLocation());
if (loc != null) cid = loc.getCid();
EventLog.List val = new EventLog.List(cid,
TelephonyManager.getDefault().getNetworkType());
EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_PDP_NETWORK_DROP, val);
// It looks like the PDP context has deactivated
// Tear everything down and try to reconnect
Log.i(LOG_TAG, "PDP connection has dropped. Reconnecting");
// Add an event log when the network drops PDP
int cid = -1;
GsmCellLocation loc = ((GsmCellLocation)phone.getCellLocation());
if (loc != null) cid = loc.getCid();
EventLog.List val = new EventLog.List(cid,
TelephonyManager.getDefault().getNetworkType());
EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_PDP_NETWORK_DROP, val);
cleanUpConnection(true, null);
return;
}
if (true) {
//
// Workaround for issue #655426
//
// --------------------------
// This is how some things work now: the PDP context is still
// listed with active = false, which makes it hard to
// distinguish an activating context from an activated-and-then
// deactivated one.
//
// Here, we only consider this authoritative if we asked for the
// PDP list. If it was an unsolicited response, we poll again
// to make sure everyone agrees on the initial state
if (state == State.CONNECTED
&& !pdpStatesHasActiveCID(pdpStates, cidActive)) {
cleanUpConnection(true, null);
return;
} else if (!pdpStatesHasActiveCID(pdpStates, cidActive)) {
// Here, we only consider this authoritative if we asked for the
// PDP list. If it was an unsolicited response, we poll again
// to make sure everyone agrees on the initial state.
if (!explicitPoll) {
// We think it disconnected but aren't sure...poll from our side
phone.mCM.getPDPContextList(
this.obtainMessage(EVENT_GET_PDP_LIST_COMPLETE));
this.obtainMessage(EVENT_GET_PDP_LIST_COMPLETE));
} else {
Log.i(LOG_TAG, "PDP connection has dropped (active=false case). "
+ " Reconnecting");
@@ -895,10 +876,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
int cid = -1;
GsmCellLocation loc = ((GsmCellLocation)phone.getCellLocation());
if (loc != null) cid = loc.getCid();
EventLog.List val = new EventLog.List(cid,
TelephonyManager.getDefault().getNetworkType());
EventLog.writeEvent(TelephonyEventLog.EVENT_LOG_PDP_NETWORK_DROP, val);
cleanUpConnection(true, null);