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

Commit 5fce53ac authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Telephony: Return 'null' as per TelephonyManager need"

parents c76db118 4bf323c3

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

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

    public String getIccSerialNumber() {

        IccRecords r = mIccRecords.get();

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

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

    }



    @Override

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

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

    public String getMsisdn() {

        IccRecords r = mIccRecords.get();

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

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

    }



    public String getLine1AlphaTag() {

        IccRecords r = mIccRecords.get();

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

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

    }



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