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

Commit f6354aca authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android (Google) Code Review
Browse files

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

parents 04e5a1cb 912e0f7d
Loading
Loading
Loading
Loading
+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);