Merge change 27304 into eclair (fdda2746) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -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];
		@@ -625,6 +623,15 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
		sendMessage(obtainMessage(EVENT_TRY_SETUP_DATA));
		}

		/**
		* @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
		*/