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

Commit 3c6bdec2 authored by Ajay Nambi's avatar Ajay Nambi Committed by Wink Saville
Browse files

Telephony: Return 'null' as per TelephonyManager need 

    Return 'null' instead of "" (empty string) when Line1AlphaTag,
    IccSerialNumber and Msisdn are unavailable.

    Bug: 8449375
    Change-Id: I5d8052922363f4b3b900bcdea490afe22fedce4f

Change-Id: Iaa77764af8f2c12c11c990c6c23152ba1dac84cb
parent 94354e82

src/java/com/android/internal/telephony/PhoneBase.java

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
    @Override

    public String getIccSerialNumber() {

        IccRecords r = mIccRecords.get();

        return (r != null) ? r.getIccId() : "";

        return (r != null) ? r.getIccId() : null;

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -896,13 +896,13 @@ public class GSMPhone extends PhoneBase { 
    @Override

    public String getMsisdn() {

        IccRecords r = mIccRecords.get();

        return (r != null) ? r.getMsisdnNumber() : "";

        return (r != null) ? r.getMsisdnNumber() : null;

    }



    @Override

    public String getLine1AlphaTag() {

        IccRecords r = mIccRecords.get();

        return (r != null) ? r.getMsisdnAlphaTag() : "";

        return (r != null) ? r.getMsisdnAlphaTag() : null;

    }



    @Override