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

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

Merge "Telephony: Return 'null' when SubscriberId and Line1Number are unavailable"

parents 22c3bbde 4b048b32

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

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




    public String getSubscriberId() {

    public String getSubscriberId() {

        IccRecords r = mIccRecords.get();

        IccRecords r = mIccRecords.get();

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

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

    }

    }





    public String getLine1Number() {

    public String getLine1Number() {

        IccRecords r = mIccRecords.get();

        IccRecords r = mIccRecords.get();

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

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

    }

    }





    @Override

    @Override