commit edb988128e5b14b46c692d19ea4f536d7daa7b39
author Libin Tang <Libin.Tang@motorola.com> Mon Oct 12 14:23:09 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 12 14:23:09 2009 -0700
tree 6e63fd23d9cf71b96ff3acb4a0109eb25058d759
parent 347daf3a9802b2a4184ff8aa90b4af6c5de79ab7
parent febb94cdbb7c7b7091401d21824bfab32b9daca5

am febb94cd: Make standard roaming indicator display indications configurable

Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-mr2

* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
  Make standard roaming indicator display indications configurable

telephony/java/com/android/internal/telephony/cdma/EriManager.java

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 @@
     }
 
     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: