Bad conflict merge.

Bug: 20160491
Change-Id: I4f5b21eaaf5af5cab4b69be2e8c35e067165a0e3

1 files changed, 0 insertions, 25 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 0880607fc..51cd11e6e 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -110,31 +110,6 @@ public class InCallPresenter implements CallList.Listener,
      */
     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