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

Commit 907a9737 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am ae117a6c: Merge "Don\'t play call waiting for first incoming call" into lmp-dev 

* commit 'ae117a6c':
  Don't play call waiting for first incoming call
parents cb781559 ae117a6c

src/com/android/server/telecom/Ringer.java

+5 −1
Original line number Diff line number Diff line
@@ -203,7 +203,11 @@ final class Ringer extends CallsManagerListenerBase { 
                        VIBRATION_ATTRIBUTES);

                mIsVibrating = true;

            }

        } else {

        } else if (foregroundCall != null) {

            // The first incoming call added to Telecom is not a foreground call at this point

            // in time. If the current foreground call is null at point, don't play call-waiting

            // as the call will eventually be promoted to the foreground call and play the

            // ring tone.

            Log.v(this, "Playing call-waiting tone.");



            // All incoming calls are in background so play call waiting.