commit 40f78c210512570f14cdfde9613dd85c510a1c0c
author Santos Cordon <santoscordon@google.com> Mon Apr 07 02:11:42 2014 -0700
committer Santos Cordon <santoscordon@google.com> Tue Apr 08 15:36:01 2014 -0700
tree d55da6bd74187ee3059777403356ff93f7a03011
parent 6b12fe34d66c8b7693ec37a9e64882bae6f92790

Add call waiting to Ringer.java.

When an incoming call is in the background, play call waiting instead of
ringer.

Bug: 13674415

Change-Id: I9d450202774c6890794fa318fdab01290b4a7eb2

src/com/android/telecomm/InCallTonePlayer.java

diff --git a/src/com/android/telecomm/InCallTonePlayer.java b/src/com/android/telecomm/InCallTonePlayer.java
index 258f8b0..aa9655d 100644
--- a/src/com/android/telecomm/InCallTonePlayer.java
+++ b/src/com/android/telecomm/InCallTonePlayer.java
@@ -127,8 +127,10 @@
                     // TODO: fill in
                     throw new IllegalStateException("OTA Call ended NYI.");
                 case TONE_CALL_WAITING:
-                    // TODO: fill in.
-                    throw new IllegalStateException("Call waiting NYI.");
+                    toneType = ToneGenerator.TONE_SUP_CALL_WAITING;
+                    toneVolume = RELATIVE_VOLUME_HIPRI;
+                    toneLengthMillis = Integer.MAX_VALUE - TIMEOUT_BUFFER_MILLIS;
+                    break;
                 case TONE_CDMA_DROP:
                     toneType = ToneGenerator.TONE_CDMA_CALLDROP_LITE;
                     toneVolume = RELATIVE_VOLUME_LOPRI;