drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am febb94cd: Make standard roaming indicator display indications configurable

Browse Source 
Merge commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-mr2

* commit 'febb94cdbb7c7b7091401d21824bfab32b9daca5':
  Make standard roaming indicator display indications configurable
This commit is contained in:
Libin Tang
2009-10-12 14:23:09 -07:00
committed by Android Git Automerger
parent 347daf3a98 febb94cdbb
commit edb988128e
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
telephony/java/com/android/internal/telephony/cdma/EriManager.java
View File

@ -282,11 +282,21 @@ public final class EriManager {
} }
private EriDisplayInformation getEriDisplayInformation(int roamInd, int defRoamInd){ private EriDisplayInformation getEriDisplayInformation(int roamInd, int defRoamInd){
//int iconIndex = -1;
//int iconMode = -1;
//String iconText = "ERI text";
EriDisplayInformation ret; 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) { switch (roamInd) {
// Handling the standard roaming indicator (non-ERI) // Handling the standard roaming indicator (non-ERI)
case EriInfo.ROAMING_INDICATOR_ON: case EriInfo.ROAMING_INDICATOR_ON: