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

Commit aa08bca2 authored by andychou's avatar andychou Committed by android-build-merger
Browse files

Merge "If ERI roaming is OFF and SID/NID matches, use operator name from... 

Merge "If ERI roaming is OFF and SID/NID matches, use operator name from CSIM." into qt-dev am: 7b9367d2 am: 62e29974
am: 7cfabc86

Change-Id: Ic7e6c4e53b5bd8e2d3c6b4762ef04540c766fa30
parents 7e8b9d08 7cfabc86

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

+4 −6
Original line number Diff line number Diff line
@@ -3413,10 +3413,10 @@ public class ServiceStateTracker extends Handler { 
    }



    private String getOperatorNameFromEri() {

        String eriText = null;

        if (mPhone.isPhoneTypeCdma()) {

            if ((mCi.getRadioState() == TelephonyManager.RADIO_POWER_ON)

                    && (!mIsSubscriptionFromRuim)) {

                String eriText;

                // 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();
@@ -3426,7 +3426,6 @@ public class ServiceStateTracker extends Handler { 
                    eriText = mPhone.getContext().getText(

                            com.android.internal.R.string.roamingTextSearching).toString();

                }

                return eriText;

            }

        } else if (mPhone.isPhoneTypeCdmaLte()) {

            boolean hasBrandOverride = mUiccController.getUiccCard(getPhoneId()) != null &&
@@ -3437,7 +3436,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.getOperatorAlpha();

                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();
@@ -3454,7 +3453,6 @@ public class ServiceStateTracker extends Handler { 
                    eriText = mPhone.getContext()

                            .getText(com.android.internal.R.string.roamingTextSearching).toString();

                }

                return eriText;

            }



            if (mUiccApplcation != null && mUiccApplcation.getState() == AppState.APPSTATE_READY &&
@@ -3470,11 +3468,11 @@ public class ServiceStateTracker extends Handler { 
                if (showSpn && (iconIndex == EriInfo.ROAMING_INDICATOR_OFF)

                        && isInHomeSidNid(mSS.getCdmaSystemId(), mSS.getCdmaNetworkId())

                        && mIccRecords != null) {

                    return getServiceProviderName();

                    eriText = getServiceProviderName();

                }

            }

        }

        return null;

        return eriText;

    }



    /**