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

Commit 34321b6b authored by Michele Berionne's avatar Michele Berionne Committed by Chi Zhang
Browse files

Fix null pointer exceptions 

Bug: 170967170
Test: make
Merged-In: Iff1cff805a185767d2f28951409c783b1fd4daa0
Change-Id: Ib2bcd6a1a3732922843da00f459d24f02e650509
parent 5b388a03

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

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




    @Override

    @Override

    public int getCarrierId() {

    public int getCarrierId() {

        return mCarrierResolver.getCarrierId();

        return mCarrierResolver != null

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

    }

    }





    @Override

    @Override

    public String getCarrierName() {

    public String getCarrierName() {

        return mCarrierResolver.getCarrierName();

        return mCarrierResolver != null

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

    }

    }





    @Override

    @Override

    public int getMNOCarrierId() {

    public int getMNOCarrierId() {

        return mCarrierResolver.getMnoCarrierId();

        return mCarrierResolver != null

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

    }

    }





    @Override

    @Override

    public int getSpecificCarrierId() {

    public int getSpecificCarrierId() {

        return mCarrierResolver.getSpecificCarrierId();

        return mCarrierResolver != null

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

    }

    }





    @Override

    @Override

    public String getSpecificCarrierName() {

    public String getSpecificCarrierName() {

        return mCarrierResolver.getSpecificCarrierName();

        return mCarrierResolver != null

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

    }

    }





    @Override

    @Override

    public void resolveSubscriptionCarrierId(String simState) {

    public void resolveSubscriptionCarrierId(String simState) {

        if (mCarrierResolver != null) {

            mCarrierResolver.resolveSubscriptionCarrierId(simState);

            mCarrierResolver.resolveSubscriptionCarrierId(simState);

        }

        }

    }





    @Override

    @Override

    public int getCarrierIdListVersion() {

    public int getCarrierIdListVersion() {

        return mCarrierResolver.getCarrierListVersion();

        return mCarrierResolver != null

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

    }

    }





    @Override

    @Override

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

+2 −1
Original line number Original line 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..

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

        ServiceState serviceState = getServiceState();

        ServiceState serviceState = getServiceState();

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

        return serviceState != null

                ? serviceState.getVoiceNetworkType() : TelephonyManager.NETWORK_TYPE_UNKNOWN;

    }

    }





    private boolean getIsRoaming() {

    private boolean getIsRoaming() {