commit 893f9e3fa066cdd6194b9aa60dbeb49462c2e921
author Evan Charlton <evanc@google.com> Wed Apr 09 08:51:52 2014 -0700
committer Evan Charlton <evanc@google.com> Wed Apr 09 13:09:58 2014 -0700
tree 7f04806ce0d528e36ec9ea0aac7273876c1c0a5a
parent 40f78c210512570f14cdfde9613dd85c510a1c0c

Don't start ringback until CallService ACK

Only start playing the ringback tone once a CallService has
acknowledged that it can be handling the call.

Bug: 13902624

Change-Id: I702dff71e4042ae87dd9aa2c46d53e9bdd66f321

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 8e81752..5c95211 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -110,8 +110,7 @@
         mListeners.add(new CallLogManager(app));
         mListeners.add(new PhoneStateBroadcaster());
         mListeners.add(new InCallController());
-        mListeners.add(
-                new Ringer(mCallAudioManager, this, playerFactory, TelecommApp.getInstance()));
+        mListeners.add(new Ringer(mCallAudioManager, this, playerFactory, app));
         mListeners.add(new RingbackPlayer(this, playerFactory));
         mListeners.add(new InCallToneMonitor(playerFactory, this));
         mListeners.add(mCallAudioManager);