From ae7ee6ef5d10d3ca8f51a6bd8ab7f6a317a7eb46 Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Tue, 2 Apr 2019 16:39:48 -0700 Subject: [PATCH] Clear ImsPhoneCallTracker pending MO call on handover If the call is handed over to CS before we receive an onCallProgressing callback from the ImsService, clear the pending MO call. This can happen during a silent IMS->CS redial for emergency calls, for example. Bug: 129727740 Test: atest FrameworksTelephonyTests Change-Id: I88c785bd9b860f4196f28b68e71ee1ab2c40ba4d --- .../internal/telephony/imsphone/ImsPhoneCallTracker.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java index 9919864930..6b01f68008 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java @@ -3147,6 +3147,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { } call.mConnections.clear(); call.mState = ImsPhoneCall.State.IDLE; + if (mPendingMO != null) { + // If the call is handed over before moving to alerting (i.e. e911 CSFB redial), clear + // pending MO here. + logi("pending MO on handover, clearing..."); + mPendingMO = null; + } } /* package */ -- GitLab