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

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

Browse Source 
Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp

* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
  CallManager: do not deliver ring event if fg call is live.
This commit is contained in:
Hung-ying Tyan
2010-08-18 13:37:11 -07:00
committed by Android Git Automerger
parent 8cbaf59e31 f6354aca3a
commit 16848a15bb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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:
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; break;
case EVENT_RINGBACK_TONE: case EVENT_RINGBACK_TONE:
mRingbackToneRegistrants.notifyRegistrants((AsyncResult) msg.obj); mRingbackToneRegistrants.notifyRegistrants((AsyncResult) msg.obj);