commit 36ebb0d4d04346a367b7a54b178ab4f78696e95c
author Gabriel Peal <gpeal@google.com> Thu Mar 20 09:20:43 2014 -0700
committer Gabriel Peal <gpeal@google.com> Tue Mar 25 11:11:13 2014 -0700
tree 17595105205161edb755fd0add25e0cd4e8e500f
parent ed3a443c39961cd25822c14e3df6e18c071f3498

resolved conflicts for merge of 74fb97de to master

Change-Id: Ia068e1e5f9f4995a84d5a184efa1cc76d0d159e4

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 1ce99a3..62d542f 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -489,7 +489,8 @@
             callHandlerServiceProxy = new CallHandlerServiceProxy(this, callModeler,
                     callCommandService, audioRouter);
 
-            phoneMgr = PhoneInterfaceManager.init(this, phone, callHandlerServiceProxy);
+            phoneMgr = PhoneInterfaceManager.init(this, phone, callHandlerServiceProxy, callModeler,
+                    dtmfTonePlayer);
 
             // Create the CallNotifer singleton, which handles
             // asynchronous events from the telephony layer (like