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

Merge change 21100 into donut

Browse Source 
* changes:
  Use dataRoaming in dataConnectionTracker.
This commit is contained in:
Android (Google) Code Review
2009-08-13 12:36:22 -07:00
parent 94ff3f1f08 8c6b883cd3
commit 696b912e85
2 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,7 +412,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
* @return false while no data connection if all above requirements are met.
*/
public boolean isDataConnectionAsDesired() {
boolean roaming = phone.getServiceState().getRoaming();
boolean roaming = getDataRoaming();
if (mGsmPhone.mSIMRecords.getRecordsLoaded() &&
mGsmPhone.mSST.getCurrentGprsState() == ServiceState.STATE_IN_SERVICE &&
@@ -424,6 +424,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
return true;
}
private boolean getDataRoaming() {
return mGsmPhone.mSST.getDataRoaming();
}
private boolean isApnTypeActive(String type) {
// TODO: to support simultaneous, mActiveApn can be a List instead.
return mActiveApn != null && mActiveApn.canHandleType(type);
@@ -533,7 +537,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
private boolean isDataAllowed() {
boolean roaming = phone.getServiceState().getRoaming();
boolean roaming = getDataRoaming();
return getAnyDataEnabled() && (!roaming || getDataOnRoamingEnabled());
}
@@ -580,7 +584,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
int gprsState = mGsmPhone.mSST.getCurrentGprsState();
boolean roaming = phone.getServiceState().getRoaming();
boolean roaming = getDataRoaming();
boolean desiredPowerState = mGsmPhone.mSST.getDesiredPowerState();
if ((state == State.IDLE || state == State.SCANNING)
@@ -1245,16 +1249,38 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
}
/**
* Check the data roaming consistency since this can be triggered by
* voice roaming flag of ServiceState in setDataOnRoamingEnabled()
*
* TODO make this triggered by data roaming state only
*/
@Override
protected void onRoamingOff() {
trySetupData(Phone.REASON_ROAMING_OFF);
if (!getDataRoaming()) { //data roaming is off
trySetupData(Phone.REASON_ROAMING_OFF);
} else { // Inconsistent! data roaming is on
sendMessage(obtainMessage(EVENT_ROAMING_ON));
}
}
/**
* Check the data roaming consistency since this can be triggered by
* voice roaming flag of ServiceState in setDataOnRoamingEnabled()
*
* TODO make this triggered by data roaming state only
*/
@Override
protected void onRoamingOn() {
if (getDataOnRoamingEnabled()) {
trySetupData(Phone.REASON_ROAMING_ON);
} else {
if (DBG) log("Tear down data connection on roaming.");
cleanUpConnection(true, Phone.REASON_ROAMING_ON);
if (getDataRoaming()) { // data roaming is on
if (getDataOnRoamingEnabled()) {
trySetupData(Phone.REASON_ROAMING_ON);
} else {
if (DBG) log("Tear down data connection on roaming.");
cleanUpConnection(true, Phone.REASON_ROAMING_ON);
}
} else { // Inconsistent! data roaming is off
sendMessage(obtainMessage(EVENT_ROAMING_OFF));
}
}

22
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -88,6 +88,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
private int newNetworkType = 0;
/* gsm roaming status solely based on TS 27.007 7.2 CREG */
private boolean mGsmRoaming = false;
/* data roaming status solely based on TS 27.007 10.1.19 CGREG */
private boolean mDataRoaming = false;
private boolean newDataRoaming = false;
private RegistrantList gprsAttachedRegistrants = new RegistrantList();
private RegistrantList gprsDetachedRegistrants = new RegistrantList();
@@ -309,6 +312,10 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
psRestrictDisabledRegistrants.remove(h);
}
/*protected*/ boolean getDataRoaming() {
return mDataRoaming;
}
//***** Called from GSMPhone
public void
getLacAndCid(Message onComplete) {
@@ -666,6 +673,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
}
}
newGPRSState = regCodeToServiceState(regState);
newDataRoaming = regCodeIsRoaming(regState);
newNetworkType = type;
break;
@@ -693,6 +701,11 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
if (pollingContext[0] == 0) {
newSS.setRoaming(isRoamingBetweenOperators(mGsmRoaming, newSS));
// when both roaming indicators are true but not roaming between
// operators, roaming should set to false.
if (newDataRoaming && mGsmRoaming && !newSS.getRoaming()) {
newDataRoaming = false;
}
pollStateDone();
}
@@ -722,6 +735,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
newCellLoc.setStateInvalid();
setSignalStrengthDefaultValues();
mGotCountryCode = false;
newDataRoaming = false;
pollStateDone();
break;
@@ -731,6 +745,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
newCellLoc.setStateInvalid();
setSignalStrengthDefaultValues();
mGotCountryCode = false;
newDataRoaming = false;
pollStateDone();
break;
@@ -745,6 +760,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
newCellLoc.setStateInvalid();
setSignalStrengthDefaultValues();
mGotCountryCode = false;
newDataRoaming = false;
mDataRoaming = false;
//NOTE: pollStateDone() is not needed in this case
break;
@@ -829,9 +846,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
boolean hasChanged = !newSS.equals(ss);
boolean hasRoamingOn = !ss.getRoaming() && newSS.getRoaming();
boolean hasRoamingOn = !mDataRoaming && newDataRoaming;
boolean hasRoamingOff = ss.getRoaming() && !newSS.getRoaming();
boolean hasRoamingOff = mDataRoaming && !newDataRoaming;
boolean hasLocationChanged = !newCellLoc.equals(cellLoc);
@@ -848,6 +865,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
gprsState = newGPRSState;
networkType = newNetworkType;
mDataRoaming = newDataRoaming;
newSS.setStateOutOfService(); // clean slate for next time