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

Commit 30f40c53 authored by Michele Berionne's avatar Michele Berionne Committed by Automerger Merge Worker
Browse files

Fix null pointer exceptions am: 34321b6b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1544670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I253dfc2b78fef1da1e6faed42976ada74df3110c
parents 45351d47 34321b6b

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

+15 −7
Original line number Diff line number Diff line
@@ -1876,37 +1876,45 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public int getCarrierId() {

        return mCarrierResolver.getCarrierId();

        return mCarrierResolver != null

                ? mCarrierResolver.getCarrierId() : super.getCarrierId();

    }



    @Override

    public String getCarrierName() {

        return mCarrierResolver.getCarrierName();

        return mCarrierResolver != null

                ? mCarrierResolver.getCarrierName() : super.getCarrierName();

    }



    @Override

    public int getMNOCarrierId() {

        return mCarrierResolver.getMnoCarrierId();

        return mCarrierResolver != null

                ? mCarrierResolver.getMnoCarrierId() : super.getMNOCarrierId();

    }



    @Override

    public int getSpecificCarrierId() {

        return mCarrierResolver.getSpecificCarrierId();

        return mCarrierResolver != null

                ? mCarrierResolver.getSpecificCarrierId() : super.getSpecificCarrierId();

    }



    @Override

    public String getSpecificCarrierName() {

        return mCarrierResolver.getSpecificCarrierName();

        return mCarrierResolver != null

                ? mCarrierResolver.getSpecificCarrierName() : super.getSpecificCarrierName();

    }



    @Override

    public void resolveSubscriptionCarrierId(String simState) {

        if (mCarrierResolver != null) {

            mCarrierResolver.resolveSubscriptionCarrierId(simState);

        }

    }



    @Override

    public int getCarrierIdListVersion() {

        return mCarrierResolver.getCarrierListVersion();

        return mCarrierResolver != null

                ? mCarrierResolver.getCarrierListVersion() : super.getCarrierIdListVersion();

    }



    @Override

src/java/com/android/internal/telephony/metrics/SmsStats.java

+2 −1
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ public class SmsStats { 
        }

        // TODO(b/168837897): Returns the RAT at the time the SMS was received..

        ServiceState serviceState = getServiceState();

        return serviceState != null ? serviceState.getVoiceNetworkType() : null;

        return serviceState != null

                ? serviceState.getVoiceNetworkType() : TelephonyManager.NETWORK_TYPE_UNKNOWN;

    }



    private boolean getIsRoaming() {