Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07764c73 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge ac1a392a on remote branch"

parents 08b0fd2e cc2d9f93

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

+4 −0
Original line number Diff line number Diff line
@@ -860,6 +860,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

+8 −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);

        }
@@ -327,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
@@ -486,11 +486,16 @@ 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) {

            mAttachedRegistrants.notifyRegistrants();

        }

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

+4 −6
Original line number Diff line number Diff line
@@ -676,13 +676,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;
@@ -786,7 +782,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,
@@ -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) {