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

1 files changed, 1 insertions, 4 deletions

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 946e0ebd0..173fe42ec 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -100,10 +100,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener,
         mNotificationManager =
                 (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
         mDialerRingtoneManager = new DialerRingtoneManager(
-                new InCallTonePlayer(
-                        AudioModeProvider.getInstance(),
-                        new ToneGeneratorFactory(),
-                        new PausableExecutorImpl()),
+                new InCallTonePlayer(new ToneGeneratorFactory(), new PausableExecutorImpl()),
                 CallList.getInstance());
         mCurrentNotification = NOTIFICATION_NONE;
     }