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

Commit c95c50a1 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Merge commit '1ff88113' into manual_merge_1ff8811 

Change-Id: Icdec37469abb70462cb45ea843032fccd0a77a49
parents 6b5c3264 1ff88113

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

+5 −5
Original line number Diff line number Diff line
@@ -2171,7 +2171,7 @@ public class ServiceStateTracker extends Handler { 
                        "of service, set plmn='" + plmn + "'");

            } else if (mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE) {

                // In either home or roaming service

                plmn = mSS.getOperatorAlphaLong();

                plmn = mSS.getOperatorAlpha();

                showPlmn = !TextUtils.isEmpty(plmn) &&

                        ((rule & SIMRecords.SPN_RULE_SHOW_PLMN)

                                == SIMRecords.SPN_RULE_SHOW_PLMN);
@@ -2251,7 +2251,7 @@ public class ServiceStateTracker extends Handler { 
            mCurPlmn = plmn;

        } else {

            // mOperatorAlphaLong contains the ERI text

            String plmn = mSS.getOperatorAlphaLong();

            String plmn = mSS.getOperatorAlpha();

            boolean showPlmn = false;



            showPlmn = plmn != null;
@@ -2691,7 +2691,7 @@ public class ServiceStateTracker extends Handler { 


            updateSpnDisplay();



            tm.setNetworkOperatorNameForPhone(mPhone.getPhoneId(), mSS.getOperatorAlphaLong());

            tm.setNetworkOperatorNameForPhone(mPhone.getPhoneId(), mSS.getOperatorAlpha());



            String prevOperatorNumeric = tm.getNetworkOperatorForPhone(mPhone.getPhoneId());

            operatorNumeric = mSS.getOperatorNumeric();
@@ -2919,7 +2919,7 @@ public class ServiceStateTracker extends Handler { 


            String operatorNumeric;



            tm.setNetworkOperatorNameForPhone(mPhone.getPhoneId(), mSS.getOperatorAlphaLong());

            tm.setNetworkOperatorNameForPhone(mPhone.getPhoneId(), mSS.getOperatorAlpha());



            String prevOperatorNumeric = tm.getNetworkOperatorForPhone(mPhone.getPhoneId());

            operatorNumeric = mSS.getOperatorNumeric();
@@ -3279,7 +3279,7 @@ public class ServiceStateTracker extends Handler { 
                            mPhone.getContext().getResources().getBoolean(com.android.internal.R.

                                    bool.config_LTE_eri_for_network_name))) {

                // Only when CDMA is in service, ERI will take effect

                String eriText = mSS.getOperatorAlphaLong();

                String eriText = mSS.getOperatorAlpha();

                // Now the Phone sees the new ServiceState so it can get the new ERI text

                if (mSS.getVoiceRegState() == ServiceState.STATE_IN_SERVICE) {

                    eriText = mPhone.getCdmaEriText();

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,10 @@ public class ServiceStateTest extends TestCase { 
        assertEquals("long", ss.getDataOperatorAlphaLong());

        assertEquals("short", ss.getDataOperatorAlphaShort());

        assertEquals("numeric", ss.getDataOperatorNumeric());

        assertEquals("long", ss.getOperatorAlpha());



        ss.setOperatorName("", "short", "");

        assertEquals("short", ss.getOperatorAlpha());

    }



    @SmallTest