From 5558f89b14af81d38364afe9e51a56f8557fd282 Mon Sep 17 00:00:00 2001
From: Brandon Maxwell <maxwelb@google.com>
Date: Thu, 10 Mar 2016 17:00:57 -0800
Subject: Removing unneed bluetooth code

+ By playing through AudioManager.STREAM_VOICE_CALL, routing audio to
bluetooth is handled properly for us.
+ This change removes the code that was preparing to manually play
the call waiting tone through bluetooth.
+ Small fix ups for javadoc

Bug: 26932998
Change-Id: Ib5f872c72cdfa44ab0bc2ff5d7e41645aba813ff
---
 .../src/com/android/incallui/ringtone/InCallTonePlayerTest.java  | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'InCallUI/tests')

diff --git a/InCallUI/tests/src/com/android/incallui/ringtone/InCallTonePlayerTest.java b/InCallUI/tests/src/com/android/incallui/ringtone/InCallTonePlayerTest.java
index 59611f701..bde5c50e4 100644
--- a/InCallUI/tests/src/com/android/incallui/ringtone/InCallTonePlayerTest.java
+++ b/InCallUI/tests/src/com/android/incallui/ringtone/InCallTonePlayerTest.java
@@ -21,7 +21,6 @@ import android.media.ToneGenerator;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.android.incallui.AudioModeProvider;
 import com.android.incallui.async.PausableExecutor;
 import com.android.incallui.async.SingleProdThreadExecutor;
 
@@ -32,7 +31,6 @@ import org.mockito.MockitoAnnotations;
 @SmallTest
 public class InCallTonePlayerTest extends AndroidTestCase {
 
-    @Mock private AudioModeProvider mAudioModeProvider;
     @Mock private ToneGeneratorFactory mToneGeneratorFactory;
     @Mock private ToneGenerator mToneGenerator;
     private InCallTonePlayer mInCallTonePlayer;
@@ -52,8 +50,7 @@ public class InCallTonePlayerTest extends AndroidTestCase {
         Mockito.when(mToneGeneratorFactory.newInCallToneGenerator(Mockito.anyInt(),
                 Mockito.anyInt())).thenReturn(mToneGenerator);
         mExecutor = new SingleProdThreadExecutor();
-        mInCallTonePlayer = new InCallTonePlayer(mAudioModeProvider, mToneGeneratorFactory,
-                mExecutor);
+        mInCallTonePlayer = new InCallTonePlayer(mToneGeneratorFactory, mExecutor);
     }
 
     @Override
@@ -92,10 +89,6 @@ public class InCallTonePlayerTest extends AndroidTestCase {
         } catch (IllegalStateException e) {}
     }
 
-    public void testPlay_BlueToothStream() {
-        // TODO (maxwelb): b/26932998 play through bluetooth
-    }
-
     public void testPlay_VoiceCallStream() throws InterruptedException {
         mInCallTonePlayer.play(InCallTonePlayer.TONE_CALL_WAITING);
         mExecutor.awaitMilestoneForTesting();
-- 
cgit v1.2.3