commit 3d5ceda9a453f6cd30cbbb37091d828cfada0bd6
author Amit Mahajan <amitmahajan@google.com> Fri Dec 05 11:48:44 2014 -0800
committer The Android Automerger <android-build@google.com> Thu Dec 11 13:49:31 2014 -0800
tree 8c14c013f6a0e1ba97eb493ecb107fd744617f22
parent 8df0fe78e06eee0fdfb8741c04e9e88bc915ca94

Change to display correct network name on locked/quick settings screen.

Bug: 18161228
Change-Id: Ic5ab163ba238958ac74a4651425c9d2041e6e251

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

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
index 8264c71..dbf5d7e 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
@@ -433,7 +433,10 @@
         if (hasChanged) {
             boolean hasBrandOverride = mUiccController.getUiccCard() == null ? false :
                     (mUiccController.getUiccCard().getOperatorBrandOverride() != null);
-            if (!hasBrandOverride && (mCi.getRadioState().isOn()) && (mPhone.isEriFileLoaded())) {
+            if (!hasBrandOverride && (mCi.getRadioState().isOn()) && (mPhone.isEriFileLoaded()) &&
+                    (mSS.getRilVoiceRadioTechnology() != ServiceState.RIL_RADIO_TECHNOLOGY_LTE ||
+                            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();
                 // Now the CDMAPhone sees the new ServiceState so it can get the

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

diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index c12467d..32928ac 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -765,9 +765,8 @@
                     }
 
                     if (!mIsSubscriptionFromRuim) {
-                        // In CDMA in case on NV, the ss.mOperatorAlphaLong is set later with the
-                        // ERI text, so here it is ignored what is coming from the modem.
-                        mNewSS.setOperatorName(null, opNames[1], opNames[2]);
+                        // NV device (as opposed to CSIM)
+                        mNewSS.setOperatorName(opNames[0], opNames[1], opNames[2]);
                     } else {
                         String brandOverride = mUiccController.getUiccCard() != null ?
                             mUiccController.getUiccCard().getOperatorBrandOverride() : null;