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

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

am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg... 

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

Merge commit '16848a15'

* commit '16848a15':
  CallManager: do not deliver ring event if fg call is live.
parents e68de480 16848a15

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