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

Commit 63cb797b authored by Zoran Jovanovic's avatar Zoran Jovanovic Committed by Robert Greenwalt
Browse files

Get the correct operator name 

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/base with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
parent bd9734a4

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

+6 −6
Original line number Diff line number Diff line
@@ -2114,7 +2114,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);
@@ -2219,7 +2219,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;
@@ -2620,7 +2620,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();
@@ -2842,7 +2842,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();
@@ -3065,7 +3065,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();
@@ -3104,7 +3104,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();

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