am 715aba5a: am edb98812: am febb94cd: Make standard roaming indicator display indications configurable

Merge commit '715aba5a7a9970cb4413041644f002823dfbd08b'

* commit '715aba5a7a9970cb4413041644f002823dfbd08b':
  Make standard roaming indicator display indications configurable

1 files changed, 13 insertions, 3 deletions

diff --git a/telephony/java/com/android/internal/telephony/cdma/EriManager.java b/telephony/java/com/android/internal/telephony/cdma/EriManager.java
index c018c3f..9b23cdf 100644
--- a/telephony/java/com/android/internal/telephony/cdma/EriManager.java
+++ b/telephony/java/com/android/internal/telephony/cdma/EriManager.java
@@ -282,11 +282,21 @@ public final class EriManager {
     }
 
     private EriDisplayInformation getEriDisplayInformation(int roamInd, int defRoamInd){
-        //int iconIndex = -1;
-        //int iconMode = -1;
-        //String iconText = "ERI text";
         EriDisplayInformation ret;
 
+        // Carrier can use eri.xml to customize any built-in roaming display indications
+        if (isEriFileLoaded) {
+            EriInfo eriInfo = getEriInfo(roamInd);
+            if (eriInfo != null) {
+                if (DBG) Log.d(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file");
+                ret = new EriDisplayInformation(
+                        eriInfo.mIconIndex,
+                        eriInfo.mIconMode,
+                        eriInfo.mEriText);
+                return ret;
+            }
+        }
+
         switch (roamInd) {
         // Handling the standard roaming indicator (non-ERI)
         case EriInfo.ROAMING_INDICATOR_ON: