Merge "Notify data connection changed on CSS indicator update." (ac1a392a) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -325,6 +325,8 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		((mNewSS.getRilDataRadioTechnology() >= ServiceState.RIL_RADIO_TECHNOLOGY_IS95A) &&
		(mNewSS.getRilDataRadioTechnology() <= ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A));

		boolean needNotifyData = (mSS.getCssIndicator() != mNewSS.getCssIndicator());

		if (DBG) {
		log("pollStateDone:"
		+ " hasRegistered=" + hasRegistered
		@@ -484,9 +486,14 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		//DCT shall inform the availability of APN for all non-default
		//contexts.
		mIwlanRegistrants.notifyRegistrants();
		needNotifyData = false;
		} else {
		mPhone.notifyDataConnection(null);
		needNotifyData = true;
		}
		}

		if (needNotifyData) {
		mPhone.notifyDataConnection(null);
		}

		if (hasCdmaDataConnectionAttached \|\| has4gHandoff) {

+8 −1

Original line number	Diff line number	Diff line
		@@ -933,6 +933,8 @@ public class GsmServiceStateTracker extends ServiceStateTracker {

		boolean hasLocationChanged = !mNewCellLoc.equals(mCellLoc);

		boolean needNotifyData = (mSS.getCssIndicator() != mNewSS.getCssIndicator());

		// Add an event log when connection state changes
		if (hasVoiceRegStateChanged \|\| hasDataRegStateChanged) {
		EventLog.writeEvent(EventLogTags.GSM_SERVICE_STATE_CHANGE,
		@@ -1157,9 +1159,14 @@ public class GsmServiceStateTracker extends ServiceStateTracker {
		//DCT shall inform the availability of APN for all non-default
		//contexts.
		mIwlanRegistrants.notifyRegistrants();
		needNotifyData = false;
		} else {
		mPhone.notifyDataConnection(null);
		needNotifyData = true;
		}
		}

		if (needNotifyData) {
		mPhone.notifyDataConnection(null);
		}

		if (hasGprsAttached) {