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

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

am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another... 

am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread

Merge commit 'fd0ba81c'

* commit 'fd0ba81c':
  Silently reject a ringing call when another call is dialing/ringing.
parents b37cc330 fd0ba81c

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

+20 −2
Original line number Diff line number Diff line
@@ -1626,7 +1626,15 @@ public final class CallManager { 
    }







    private boolean hasMoreThanOneRingingCall() {

        int count = 0;

        for (Call call : mRingingCalls) {

            if (call.getState().isRinging()) {

                if (++count > 1) return true;

            }

        }

        return false;

    }



    private Handler mHandler = new Handler() {
@@ -1644,7 +1652,17 @@ public final class CallManager { 
                    break;

                case EVENT_NEW_RINGING_CONNECTION:

                    if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_NEW_RINGING_CONNECTION)");

                    if (getActiveFgCallState().isDialing() || hasMoreThanOneRingingCall()) {

                        Connection c = (Connection) ((AsyncResult) msg.obj).result;

                        try {

                            Log.d(LOG_TAG, "silently drop incoming call: " + c.getCall());

                            c.getCall().hangup();

                        } catch (CallStateException e) {

                            Log.w(LOG_TAG, "new ringing connection", e);

                        }

                    } else {

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

                    }

                    break;

                case EVENT_UNKNOWN_CONNECTION:

                    if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_UNKNOWN_CONNECTION)");