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

Commit ec395eb9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add null check for mPendingMO"

parents 7d447fa0 df072ff6

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);