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

Commit edb98812 authored by Libin Tang's avatar Libin Tang Committed by Android Git Automerger
Browse files

am febb94cd: Make standard roaming indicator display indications configurable 

Merge commit 'febb94cd' into eclair-mr2

* commit 'febb94cd':
  Make standard roaming indicator display indications configurable
parents 347daf3a febb94cd

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

+13 −3
Original line number Diff line number Diff line
@@ -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: