Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16848a15 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

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

Merge commit 'f6354aca' into gingerbread-plus-aosp

* commit 'f6354aca':
  CallManager: do not deliver ring event if fg call is live.
parents 8cbaf59e f6354aca

telephony/java/com/android/internal/telephony/CallManager.java

+4 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,10 @@ public final class CallManager { 
                    mUnknownConnectionRegistrants.notifyRegistrants((AsyncResult) msg.obj);

                    break;

                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);

                    }

                    break;

                case EVENT_RINGBACK_TONE:

                    mRingbackToneRegistrants.notifyRegistrants((AsyncResult) msg.obj);