diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-17 17:34:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-17 17:34:05 -0700 |
| commit | f6354aca3a4d0571a66747d9cdc247a1d411d660 (patch) | |
| tree | d3d277f3531161cbe93d6e16234e7a5a06a809ff /telephony | |
| parent | 04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321 (diff) | |
| parent | 912e0f7d9e377905ded6af3d01c52952e4fead2b (diff) | |
| download | frameworks_base-f6354aca3a4d0571a66747d9cdc247a1d411d660.zip frameworks_base-f6354aca3a4d0571a66747d9cdc247a1d411d660.tar.gz frameworks_base-f6354aca3a4d0571a66747d9cdc247a1d411d660.tar.bz2 | |
Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
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); |