From 912e0f7d9e377905ded6af3d01c52952e4fead2b Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Tue, 17 Aug 2010 17:52:34 +0800 Subject: CallManager: do not deliver ring event if fg call is live. Change-Id: If5b1bca1f09557a2ee4de9ba429d80a0393279a0 --- telephony/java/com/android/internal/telephony/CallManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'telephony') diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index 819cfbe..784f022 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -1288,7 +1288,10 @@ public final class CallManager { mUnknownConnectionRegistrants.notifyRegistrants((AsyncResult) msg.obj); break; case EVENT_INCOMING_RING: - mIncomingRingRegistrants.notifyRegistrants((AsyncResult) msg.obj); + // The event may come from RIL who's not aware of an ongoing fg call + if (!hasActiveFgCall()) { + mIncomingRingRegistrants.notifyRegistrants((AsyncResult) msg.obj); + } break; case EVENT_RINGBACK_TONE: mRingbackToneRegistrants.notifyRegistrants((AsyncResult) msg.obj); -- cgit v1.1