Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-08-17 17:34:05 -07:00
committed by Android (Google) Code Review
parent 04e5a1cba9 912e0f7d9e
commit f6354aca3a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/CallManager.java
View File

@@ -1288,7 +1288,10 @@ public final class CallManager {
mUnknownConnectionRegistrants.notifyRegistrants((AsyncResult) msg.obj); mUnknownConnectionRegistrants.notifyRegistrants((AsyncResult) msg.obj);
break; break;
case EVENT_INCOMING_RING: case EVENT_INCOMING_RING:
// The event may come from RIL who's not aware of an ongoing fg call
if (!hasActiveFgCall()) {
mIncomingRingRegistrants.notifyRegistrants((AsyncResult) msg.obj); mIncomingRingRegistrants.notifyRegistrants((AsyncResult) msg.obj);
}
break; break;
case EVENT_RINGBACK_TONE: case EVENT_RINGBACK_TONE:
mRingbackToneRegistrants.notifyRegistrants((AsyncResult) msg.obj); mRingbackToneRegistrants.notifyRegistrants((AsyncResult) msg.obj);