Merge change I59ceeae4 into eclair

* changes:
  Fix the reporting of ActiveApnTypes on CDMA
This commit is contained in:
Android (Google) Code Review
2009-09-29 11:42:46 -04:00

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];