am 9f9ce253: Merge change I59ceeae4 into eclair

Merge commit '9f9ce253648ad9dda16ae2fd3131073fe5643536' into eclair-plus-aosp

* commit '9f9ce253648ad9dda16ae2fd3131073fe5643536':
  Fix the reporting of ActiveApnTypes on CDMA
This commit is contained in:
Robert Greenwalt
2009-09-29 08:51:57 -07:00
committed by Android Git Automerger

View File

@@ -246,7 +246,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected boolean isApnTypeActive(String type) { protected boolean isApnTypeActive(String type) {
return (isApnTypeAvailable(type) && return (isApnTypeAvailable(type) &&
(state == State.CONNECTED || state == State.INITING)); (state != State.IDLE));
} }
@Override @Override
@@ -260,7 +260,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
} }
protected String[] getActiveApnTypes() { protected String[] getActiveApnTypes() {
if (state == State.CONNECTED || state == State.INITING) { if (state != State.IDLE) {
return mSupportedApnTypes.clone(); return mSupportedApnTypes.clone();
} }
return new String[0]; return new String[0];