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

Commit c90b7d25 authored by Wink Saville's avatar Wink Saville
Browse files

Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE) 

This is already in AOSP and Master, back porting to JB-MR1.

Bug: 6983013
Change-Id: Ibda258e632ecff79f22eebe093df0061ed4cdf4d
parent f4bfdd29

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

+4 −3
Original line number Diff line number Diff line
@@ -373,10 +373,11 @@ public class GsmConnection extends Connection { 
            default:

                GSMPhone phone = owner.phone;

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

                AppState uiccAppState = UiccController

                UiccCardApplication cardApp = UiccController

                        .getInstance()

                        .getUiccCardApplication(UiccController.APP_FAM_3GPP)

                        .getState();

                        .getUiccCardApplication(UiccController.APP_FAM_3GPP);

                AppState uiccAppState = (cardApp != null) ? cardApp.getState() :

                                                            AppState.APPSTATE_UNKNOWN;

                if (serviceState == ServiceState.STATE_POWER_OFF) {

                    return DisconnectCause.POWER_OFF;

                } else if (serviceState == ServiceState.STATE_OUT_OF_SERVICE