am 9274988e: am 9f9ce253: Merge change I59ceeae4 into eclair

Merge commit '9274988e444da3b8652912f1a3c0cf0847f19fe3'

* commit '9274988e444da3b8652912f1a3c0cf0847f19fe3':
  Fix the reporting of ActiveApnTypes on CDMA
This commit is contained in:
Robert Greenwalt
2009-10-01 11:13:12 -07:00
committed by Android Git Automerger

View File

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