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

Commit 14751014 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 

* commit '2e543dc1':
  CdmaLte: Use SPN from SIM card if SIM card is presend
parents ade2a546 2e543dc1

telephony/java/android/telephony/ServiceState.java

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ public class ServiceState implements Parcelable { 
     *

     * @hide

     */

    public void setCdmaEriText(String longName) {

    public void setOperatorAlphaLong(String longName) {

        mOperatorAlphaLong = longName;

    }

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

+8 −1
Original line number Diff line number Diff line
@@ -351,7 +351,14 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
                    eriText = phone.getContext()

                            .getText(com.android.internal.R.string.roamingTextSearching).toString();

                }

                ss.setCdmaEriText(eriText);

                ss.setOperatorAlphaLong(eriText);

            }

            if (cm.getSimState().isSIMReady()) {

                // SIM is found on the device. Read the operator name from the card.

                ss.setOperatorAlphaLong(phone.mIccRecords.getServiceProviderName());



                // If SIM card is present, Eri will not be used. Turn it off

                ss.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_OFF);

            }



            String operatorNumeric;

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

+1 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
                    eriText = phone.getContext().getText(

                            com.android.internal.R.string.roamingTextSearching).toString();

                }

                ss.setCdmaEriText(eriText);

                ss.setOperatorAlphaLong(eriText);

            }



            String operatorNumeric;