Merge "Enable data after phone switches from CDMA to GSM" into oc-mr1-dev (e063db11) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaCallTracker.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,11 @@ public class GsmCdmaCallTracker extends CallTracker {
		if (mPhone.isPhoneTypeGsm()) {
		mConnections = new GsmCdmaConnection[MAX_CONNECTIONS_GSM];
		mCi.unregisterForCallWaitingInfo(this);
		// Prior to phone switch to GSM, if CDMA has any emergency call
		// data will be in disabled state, after switching to GSM enable data.
		if (mIsInEmergencyCall) {
		mPhone.mDcTracker.setInternalDataEnabled(true);
		}
		} else {
		mConnections = new GsmCdmaConnection[MAX_CONNECTIONS_CDMA];
		mPendingCallInEcm = false;