Merge branch 'LNX.LA.3.5.2.2_rb1' of... (d43b5b1c) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -820,6 +820,14 @@ public abstract class ServiceStateTracker extends Handler {
		}
		}

		protected void updateCarrierMccMncConfiguration(String newOp, String oldOp, Context context) {
		// if we have a change in operator, notify wifi (even to/from none)
		if (((newOp == null) && (TextUtils.isEmpty(oldOp) == false)) \|\|
		((newOp != null) && (newOp.equals(oldOp) == false))) {
		MccTable.updateMccMncConfiguration(context, newOp, true);
		}
		}

		protected boolean isCallerOnDifferentThread() {
		boolean value = Thread.currentThread() != getLooper().getThread();
		if (VDBG) log("isCallerOnDifferentThread: " + value);
		@@ -863,12 +871,4 @@ public abstract class ServiceStateTracker extends Handler {
		DcTrackerBase dcTracker = mPhoneBase.mDcTracker;
		dcTracker.disableApnType(PhoneConstants.APN_TYPE_DEFAULT);
		}

		protected void updateCarrierMccMncConfiguration(String newOp, String oldOp, Context context) {
		// if we have a change in operator, notify wifi (even to/from none)
		if (((newOp == null) && (TextUtils.isEmpty(oldOp) == false)) \|\|
		((newOp != null) && (newOp.equals(oldOp) == false))) {
		MccTable.updateMccMncConfiguration(context, newOp, true);
		}
		}
		}

src/java/com/android/internal/telephony/cat/CommandParamsFactory.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -901,6 +901,10 @@ public class CommandParamsFactory extends Handler {
		ctlv = searchForTag(ComprehensionTlvTag.ALPHA_ID, ctlvs);
		if (ctlv != null) {
		textMsg.text = ValueParser.retrieveAlphaId(ctlv);
		// Assign the tone message text to empty string, if alpha identifier
		// data is null. If no alpha identifier tlv is present, then tone
		// message text will be null.
		if (textMsg.text == null) textMsg.text = "";
		}
		// parse tone duration
		ctlv = searchForTag(ComprehensionTlvTag.DURATION, ctlvs);

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -208,8 +208,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		+ " dataRadioTechnology=" + type);
		}
		mDataRoaming = regCodeIsRoaming(regState);

		if (mDataRoaming) mNewSS.setRoaming(true);
		} else {
		super.handlePollStateResultMessage(what, ar);
		}
		@@ -340,6 +338,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
		@@ -385,6 +385,9 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		mPhone.setSystemProperty(TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE,
		ServiceState.rilRadioTechnologyToString(mSS.getRilDataRadioTechnology()));

		// Query Signalstrength when there is a change in PS RAT.
		sendMessage(obtainMessage(EVENT_POLL_SIGNAL_STRENGTH));

		if (isIwlanFeatureAvailable()
		&& (ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN
		== mSS.getRilDataRadioTechnology())) {
		@@ -500,9 +503,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) {

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

+4 −6

Original line number	Diff line number	Diff line
		@@ -679,13 +679,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		// When registration state is roaming and TSB58
		// roaming indicator is not in the carrier-specified
		// list of ERIs for home system, mCdmaRoaming is true.
		mCdmaRoaming =
		regCodeIsRoaming(registrationState) && !isRoamIndForHomeSystem(states[10]);
		mCdmaRoaming = mCdmaRoaming \|\| mDataRoaming;
		mCdmaRoaming = regCodeIsRoaming(registrationState);
		mNewSS.setState (regCodeToServiceState(registrationState));

		mNewSS.setRilVoiceRadioTechnology(radioTechnology);

		mNewSS.setCssIndicator(cssIndicator);
		mNewSS.setSystemAndNetworkId(systemId, networkId);
		mRoamingIndicator = roamingIndicator;
		@@ -789,7 +785,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		if (!isSidsAllZeros() && isHomeSid(mNewSS.getSystemId())) {
		namMatch = true;
		}

		mCdmaRoaming =
		(mCdmaRoaming \|\| mDataRoaming) &&
		!isRoamIndForHomeSystem(String.valueOf(mRoamingIndicator));
		// Setting SS Roaming (general)
		if (mIsSubscriptionFromRuim) {
		mNewSS.setRoaming(isRoamingBetweenOperators(mCdmaRoaming, mNewSS));

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+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,
		@@ -1158,9 +1160,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) {