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

Commit ae29ac17 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 572e0087: Merge change Idfc116fe into eclair 

Merge commit '572e0087' into eclair-mr2

* commit '572e0087':
  Return null if SIM doesn't have the MSISDN Aplha tag.
parents 66b5d902 572e0087

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

+1 −10
Original line number Diff line number Diff line
@@ -879,16 +879,7 @@ public class GSMPhone extends PhoneBase { 
    }



    public String getLine1AlphaTag() {

        String ret;



        ret = mSIMRecords.getMsisdnAlphaTag();



        if (ret == null || ret.length() == 0) {

            return mContext.getText(

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

        }



        return ret;

        return mSIMRecords.getMsisdnAlphaTag();

    }



    public void setLine1Number(String alphaTag, String number, Message onComplete) {