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

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

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

* commit 'a6577f4b':
  Telephony: Return 'null' when SubscriberId and Line1Number are unavailable
parents 6b861972 a6577f4b

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

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

    public String getSubscriberId() {

        IccRecords r = mIccRecords.get();

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

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

    }



    @Override

    public String getLine1Number() {

        IccRecords r = mIccRecords.get();

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

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

    }



    @Override