diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-18 13:37:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:37:11 -0700 |
| commit | 16848a15bbb7648bb1298c91f7969073c106115c (patch) | |
| tree | e42fa2a84a55a08305e86d7bebf0b0f01c1a3b23 /telephony | |
| parent | 8cbaf59e313227d41c9881fbedb4dc3255a83b8d (diff) | |
| parent | f6354aca3a4d0571a66747d9cdc247a1d411d660 (diff) | |
| download | frameworks_base-16848a15bbb7648bb1298c91f7969073c106115c.zip frameworks_base-16848a15bbb7648bb1298c91f7969073c106115c.tar.gz frameworks_base-16848a15bbb7648bb1298c91f7969073c106115c.tar.bz2 | |
am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp
* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
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); |