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

Commit df072ff6 authored by Hall Liu's avatar Hall Liu
Browse files

Add null check for mPendingMO 

When checking to see if mPendingMO is an emergency call during hold
failure, check to see if it's null first.

Change-Id: Ief6338d565fbb8ae8159a6784ed5b31cfd83f965
Fixes: 122489866
Test: manual
parent 1fd54fcd

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −3
Original line number Diff line number Diff line
@@ -46,11 +46,9 @@ import android.provider.Settings; 
import android.telecom.ConferenceParticipant;

import android.telecom.TelecomManager;

import android.telecom.VideoProfile;

import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.CarrierConfigManager;

import android.telephony.DisconnectCause;

import android.telephony.PhoneNumberUtils;

import android.telephony.PreciseDisconnectCause;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;
@@ -2350,7 +2348,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                        dialPendingMO();

                    }

                    mHoldSwitchingState = HoldSwapState.INACTIVE;

                } else if (mPendingMO.isEmergency()) {

                } else if (mPendingMO != null && mPendingMO.isEmergency()) {

                    // If mPendingMO is an emergency call, disconnect the call that we tried to

                    // hold.

                    mBackgroundCall.getImsCall().terminate(ImsReasonInfo.CODE_UNSPECIFIED);