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

Commit 243830fa authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Prevent NPE on some CDMA devices" into mr1-staging

parents 6cbccb7e 2210f6ee

src/java/com/android/internal/telephony/cdma/CdmaConnection.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.telephony.ServiceState; 
import com.android.internal.telephony.IccCardApplicationStatus.AppState;

import com.android.internal.telephony.IccCardApplicationStatus.AppState;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.RILConstants;

import com.android.internal.telephony.UiccCardApplication;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.UiccController;





/**

/**
@@ -418,10 +419,10 @@ public class CdmaConnection extends Connection { 
            default:

            default:

                CDMAPhone phone = owner.phone;

                CDMAPhone phone = owner.phone;

                int serviceState = phone.getServiceState().getState();

                int serviceState = phone.getServiceState().getState();

                AppState uiccAppState = UiccController

                UiccCardApplication uiccCardApplication = UiccController.getInstance()

                        .getInstance()

                    .getUiccCardApplication(UiccController.APP_FAM_3GPP2);

                        .getUiccCardApplication(UiccController.APP_FAM_3GPP2)

                AppState uiccAppState = uiccCardApplication != null

                        .getState();

                    ? uiccCardApplication.getState() : null;

                if (serviceState == ServiceState.STATE_POWER_OFF) {

                if (serviceState == ServiceState.STATE_POWER_OFF) {

                    return DisconnectCause.POWER_OFF;

                    return DisconnectCause.POWER_OFF;

                } else if (serviceState == ServiceState.STATE_OUT_OF_SERVICE

                } else if (serviceState == ServiceState.STATE_OUT_OF_SERVICE