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

Commit c0384e80 authored by Jake Hamby's avatar Jake Hamby Committed by Android (Google) Code Review
Browse files

Merge "Fix GSMPhone.getServiceState() when mSST is null." into klp-dev

parents 64d73fe1 2ad65b76

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

+6 −1
Original line number Diff line number Diff line
@@ -255,7 +255,12 @@ public class GSMPhone extends PhoneBase { 
    @Override

    public ServiceState

    getServiceState() {

        if (mSST != null) {

            return mSST.mSS;

        } else {

            // avoid potential NPE in EmergencyCallHelper during Phone switch

            return new ServiceState();

        }

    }



    @Override