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

Commit 224b1843 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix NPE in ImsPhoneCallTracker" am: c0af923d 

am: 86d0cd6a

Change-Id: I56b6ac648bfa05bf7ce0bb3b92b85097b8832b5b
parents 6f5f5aa6 86d0cd6a

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

+1 −2
Original line number Diff line number Diff line
@@ -2356,8 +2356,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                        || mPendingMO.getDisconnectCause() != DisconnectCause.NOT_DISCONNECTED) {

                    mHoldSwitchingState = HoldSwapState.INACTIVE;

                    logHoldSwapState("onCallTerminated hold to dial but no pendingMo");

                }

                if (imsCall != mPendingMO.getImsCall()) {

                } else if (imsCall != mPendingMO.getImsCall()) {

                    sendEmptyMessage(EVENT_DIAL_PENDINGMO);

                    mHoldSwitchingState = HoldSwapState.INACTIVE;

                    logHoldSwapState("onCallTerminated hold to dial, dial pendingMo");