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

Commit 86d0cd6a authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix NPE in ImsPhoneCallTracker" 

am: c0af923d

Change-Id: I7a69648f2bc4b7a0211bc3b29eb886e3a1323a32
parents 4cd869de c0af923d

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