summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
index ffaa1cd..93b48a9 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
@@ -246,8 +246,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
@Override
protected boolean isApnTypeActive(String type) {
return (isApnTypeAvailable(type) &&
- mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() ==
- ServiceState.STATE_IN_SERVICE);
+ (state == State.CONNECTED || state == State.INITING));
}
@Override
@@ -261,8 +260,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
}
protected String[] getActiveApnTypes() {
- if (mCdmaPhone.mSST.getCurrentCdmaDataConnectionState() ==
- ServiceState.STATE_IN_SERVICE) {
+ if (state == State.CONNECTED || state == State.INITING) {
return mSupportedApnTypes.clone();
}
return new String[0];
@@ -626,6 +624,15 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
}
/**
+ * @override com.android.intenral.telephony.DataConnectionTracker
+ */
+ @Override
+ protected void onEnableNewApn() {
+ // for cdma we only use this when default data is enabled..
+ onTrySetupData(Phone.REASON_DATA_ENABLED);
+ }
+
+ /**
* @override com.android.internal.telephony.DataConnectionTracker
*/
protected boolean onTrySetupData(String reason) {