Fix the build

Fix the build by hacking around some errors, and scrubbing some old
ThirdPartyPhone imports.

Change-Id: I6d3c2919299c0a0b9714ffecd30da68e5c880b6a

3 files changed, 1 insertions, 4 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index bf3429f46..bd4864161 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -33,7 +33,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.contacts.common.util.ViewUtil;
-import com.android.services.telephony.common.Call;
 
 import java.util.List;
 
@@ -130,7 +129,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         }
     }
 
-    @Override
     public void setShowConnectionHandoff(boolean showConnectionHandoff) {
         Log.v(this, "setShowConnectionHandoff: " + showConnectionHandoff);
     }
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 2e15ce3fe..4e98e7fe5 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -480,7 +480,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             return;
         }
 
-        CallCommandClient.getInstance().disconnectCall(mPrimary.getCallId());
+        CallCommandClient.getInstance().disconnectCall(mPrimary.getCallId().hashCode());
     }
 
     public interface CallCardUi extends Ui {
diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
index 1f2bf903b..6b18ac8e9 100644
--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
+++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
@@ -533,7 +533,6 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
             dialpadKey.setOnTouchListener(this);
             dialpadKey.setOnKeyListener(this);
             dialpadKey.setOnHoverListener(this);
-            dialpadKey.setOnClickListener(this);
         }
     }
 }