diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-18 14:20:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 14:20:41 -0700 |
| commit | 38311b33c89fd570e238e21dcecf6dd5ccd5726c (patch) | |
| tree | f8e18697cab0b5bf23cdc62c5de1838fbd39ae1b /telephony | |
| parent | e68de480fd8d7381349e27e21cbf12a88b9297d8 (diff) | |
| parent | 16848a15bbb7648bb1298c91f7969073c106115c (diff) | |
| download | frameworks_base-38311b33c89fd570e238e21dcecf6dd5ccd5726c.zip frameworks_base-38311b33c89fd570e238e21dcecf6dd5ccd5726c.tar.gz frameworks_base-38311b33c89fd570e238e21dcecf6dd5ccd5726c.tar.bz2 | |
am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit '16848a15bbb7648bb1298c91f7969073c106115c'
* commit '16848a15bbb7648bb1298c91f7969073c106115c':
CallManager: do not deliver ring event if fg call is live.
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); |