commit cfa9c2a5ac92fe62399cd4c92e54eace9459e3e7
author Andrew Lee <anwlee@google.com> Thu Apr 16 15:42:34 2015 -0700
committer Andrew Lee <anwlee@google.com> Thu Apr 16 15:42:34 2015 -0700
tree f5e8e95178adfb1df6fa22a58554224903e12e69
parent 881803c7a014db3bffb4afccf8619e648bd59969

Bad conflict merge.

Bug: 20160491
Change-Id: I4f5b21eaaf5af5cab4b69be2e8c35e067165a0e3

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 0880607..51cd11e 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -110,31 +110,6 @@
      */
     private PhoneAccountHandle mPendingPhoneAccountHandle;
 
-    private final Phone.Listener mPhoneListener = new Phone.Listener() {
-        @Override
-        public void onBringToForeground(Phone phone, boolean showDialpad) {
-            Log.i(this, "Bringing UI to foreground.");
-            bringToForeground(showDialpad);
-        }
-        @Override
-        public void onCallAdded(Phone phone, android.telecom.Call call) {
-            // Since a call has been added we are no longer waiting for Telecom to send us a
-            // call.
-            setBoundAndWaitingForOutgoingCall(false, null);
-            call.registerCallback(mCallCallback);
-        }
-        @Override
-        public void onCallRemoved(Phone phone, android.telecom.Call call) {
-            call.unregisterCallback(mCallCallback);
-        }
-        @Override
-        public void onCanAddCallChanged(Phone phone, boolean canAddCall) {
-            for (CanAddCallListener listener : mCanAddCallListeners) {
-                listener.onCanAddCallChanged(canAddCall);
-            }
-        }
-    };
-
     private final android.telecom.Call.Callback mCallCallback =
             new android.telecom.Call.Callback() {
         @Override