diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-17 17:52:34 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-08-17 17:52:34 +0800 |
| commit | 912e0f7d9e377905ded6af3d01c52952e4fead2b (patch) | |
| tree | 3fcc56eac3758810d804a952f6a80fa77e3e47fc /telephony | |
| parent | 1ce4394c779be5e67e37bbb995da13865b36c573 (diff) | |
| download | frameworks_base-912e0f7d9e377905ded6af3d01c52952e4fead2b.zip frameworks_base-912e0f7d9e377905ded6af3d01c52952e4fead2b.tar.gz frameworks_base-912e0f7d9e377905ded6af3d01c52952e4fead2b.tar.bz2 | |
CallManager: do not deliver ring event if fg call is live.
Change-Id: If5b1bca1f09557a2ee4de9ba429d80a0393279a0
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
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); |