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

am 259db3f6: Merge "Have all connections disconnected before turning off radio." into ics-factoryrom

Browse Source 
* commit '259db3f66f8cbbf1eadec9c6b76d7e476318486c':
  Have all connections disconnected before turning off radio.
This commit is contained in:
Wink Saville
2011-09-16 22:02:31 -07:00
committed by Android Git Automerger
parent daa98fe9f7 259db3f66f
commit 6185a5caeb
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/ApnContext.java
View File

@@ -154,6 +154,12 @@ public class ApnContext {
return mState;
}
public boolean isDisconnected() {
DataConnectionTracker.State currentState = getState();
return ((currentState == DataConnectionTracker.State.IDLE) ||
currentState == DataConnectionTracker.State.FAILED);
}
public synchronized void setReason(String reason) {
if (DBG) {
log("set reason as " + reason + ", for type " + mApnType + ",current state " + mState);

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

@@ -787,9 +787,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
}
DataConnectionAc dcac = apnContext.getDataConnectionAc();
if (tearDown) {
boolean isConnected = (apnContext.getState() != State.IDLE
&& apnContext.getState() != State.FAILED);
if (!isConnected) {
if (apnContext.isDisconnected()) {
// The request is tearDown and but ApnContext is not connected.
// If apnContext is not enabled anymore, break the linkage to the DCAC/DC.
apnContext.setState(State.IDLE);
@@ -1019,11 +1017,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
*/
private void onApnChanged() {
// TODO: How to handle when multiple APNs are active?
boolean isConnected;
ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);
isConnected = (defaultApnContext.getState() != State.IDLE
&& defaultApnContext.getState() != State.FAILED);
boolean defaultApnIsDisconnected = defaultApnContext.isDisconnected();
if (mPhone instanceof GSMPhone) {
// The "current" may no longer be valid. MMS depends on this to send properly. TBD
@@ -1034,8 +1030,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
// match the current operator.
if (DBG) log("onApnChanged: createAllApnList and cleanUpAllConnections");
createAllApnList();
cleanUpAllConnections(isConnected, Phone.REASON_APN_CHANGED);
if (!isConnected) {
cleanUpAllConnections(!defaultApnIsDisconnected, Phone.REASON_APN_CHANGED);
if (defaultApnIsDisconnected) {
setupDataOnReadyApns(Phone.REASON_APN_CHANGED);
}
}
@@ -1885,7 +1881,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
// if all data connection are gone, check whether Airplane mode request was
// pending.
if (!isConnected()) {
if (isDisconnected()) {
if (mPhone.getServiceStateTracker().processPendingRadioPowerOffAfterDataOff()) {
// Radio will be turned off. No need to retry data setup
apnContext.setApnSetting(null);
@@ -1957,12 +1953,25 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
protected boolean isConnected() {
for (ApnContext apnContext : mApnContexts.values()) {
if (apnContext.getState() == State.CONNECTED) {
return true;
// At least one context is connected, return true
return true;
}
}
// There are not any contexts connected, return false
return false;
}
protected boolean isDisconnected() {
for (ApnContext apnContext : mApnContexts.values()) {
if (!apnContext.isDisconnected()) {
// At least one context was not disconnected return false
return false;
}
}
// All contexts were disconnected so return true
return true;
}
@Override
protected void notifyDataConnection(String reason) {
if (DBG) log("notifyDataConnection: reason=" + reason);