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

Commit 511a5bed authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix NPE. 

Check if we have radio capabilties yet before trying to access them.

bug:20046639
bug:20514935
Change-Id: I9e71e9fcb24475f3f0fb3983ea7b65ac419d9a97
parent 639eb9aa

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

+4 −2
Original line number Diff line number Diff line
@@ -2263,12 +2263,14 @@ public abstract class PhoneBase extends Handler implements Phone { 


    @Override

    public int getRadioAccessFamily() {

        return mRadioCapability.get().getRadioAccessFamily();

        final RadioCapability rc = getRadioCapability();

        return (rc == null ? RadioAccessFamily.RAF_UNKNOWN : rc.getRadioAccessFamily());

    }



    @Override

    public String getModemUuId() {

        return mRadioCapability.get().getLogicalModemUuid();

        final RadioCapability rc = getRadioCapability();

        return (rc == null ? "" : rc.getLogicalModemUuid());

    }



    @Override