commit c7e85d4fa0bb3325133a79d4c89f3149e0af430e
author Santos Cordon <santoscordon@google.com> Thu May 22 02:51:48 2014 -0700
committer Santos Cordon <santoscordon@google.com> Wed May 28 11:43:05 2014 -0700
tree 998e2baf3450394c1936101105da7cdc57dabc10
parent 682fe6ba2fe99e209d72a051539697a755b994c0

Move BluetoothManager to telecomm.

Copy over bluetooth manager from teleservice and add usage in
CallAudioManager (for audio routing), Ringer (ringtone routing),
InCallTonePlayer (tone routing).

Change-Id: I015961aebf42389a7f4cf3a5f89ec194d6ca64e2
Bug: 13242863

src/com/android/telecomm/InCallTonePlayer.java

diff --git a/src/com/android/telecomm/InCallTonePlayer.java b/src/com/android/telecomm/InCallTonePlayer.java
index aa9655d..7f08587 100644
--- a/src/com/android/telecomm/InCallTonePlayer.java
+++ b/src/com/android/telecomm/InCallTonePlayer.java
@@ -178,9 +178,10 @@
                     throw new IllegalStateException("Bad toneId: " + mToneId);
             }
 
-            // TODO(santoscordon): Bluetooth should be set manually (STREAM_BLUETOOTH_SCO) for tone
-            // generator.
             int stream = AudioManager.STREAM_VOICE_CALL;
+            if (mCallAudioManager.isBluetoothAudioOn()) {
+                stream = AudioManager.STREAM_BLUETOOTH_SCO;
+            }
 
             // If the ToneGenerator creation fails, just continue without it. It is a local audio
             // signal, and is not as important.