Dialer: fix build error in 87G

fix build error in Dialer.

Change-Id: I1e2ebed13193e7438075b3332750e2439991fd60

3 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 1ce88994c..5715572c8 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer;
 
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
diff --git a/src/com/android/dialer/calllog/CallLogQueryHandler.java b/src/com/android/dialer/calllog/CallLogQueryHandler.java
index 67e0fac81..04c865ca4 100755
--- a/src/com/android/dialer/calllog/CallLogQueryHandler.java
+++ b/src/com/android/dialer/calllog/CallLogQueryHandler.java
@@ -131,8 +131,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
 
     public void fetchCalls(int callType, long newerThan, int sub) {
         cancelFetch();
-        int requestId = newCallsRequest();
-        fetchCalls(QUERY_CALLLOG_TOKEN, requestId, callType, false /* newOnly */, newerThan, sub);
+        fetchCalls(QUERY_CALLLOG_TOKEN, callType, false /* newOnly */, newerThan, sub);
     }
 
     public void fetchCalls(int callType) {
@@ -141,15 +140,14 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
 
     public void fetchCalls(String filter) {
         cancelFetch();
-        int requestId = newCallsRequest();
-        fetchCalls(QUERY_CALLLOG_TOKEN ,requestId,filter);
+        fetchCalls(QUERY_CALLLOG_TOKEN, filter);
     }
 
-    public void fetchCalls(int token,int requestId,String filter) {
+    public void fetchCalls(int token, String filter) {
         String selection = "(" + Calls.NUMBER + " like '%" + filter
                 + "%'  or  " + Calls.CACHED_NAME + " like '%" + filter + "%' )";
 
-        startQuery(token, requestId, Calls.CONTENT_URI_WITH_VOICEMAIL,
+        startQuery(token, null, Calls.CONTENT_URI_WITH_VOICEMAIL,
                 CallLogQuery._PROJECTION, selection, null,
                 Calls.DEFAULT_SORT_ORDER);
     }
@@ -200,7 +198,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
                 Calls.DEFAULT_SORT_ORDER);
     }
 
-    private void fetchCalls(int token, int requestId, int callType, boolean newOnly,
+    private void fetchCalls(int token, int callType, boolean newOnly,
             long newerThan, int slotId) {
         // We need to check for NULL explicitly otherwise entries with where READ is NULL
         // may not match either the query or its negation.
@@ -247,7 +245,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
         Uri uri = Calls.CONTENT_URI_WITH_VOICEMAIL.buildUpon()
                 .appendQueryParameter(Calls.LIMIT_PARAM_KEY, Integer.toString(limit))
                 .build();
-        startQuery(token, requestId, uri,
+        startQuery(token, null, uri,
                 CallLogQuery._PROJECTION, selection, selectionArgs.toArray(EMPTY_STRING_ARRAY),
                 Calls.DEFAULT_SORT_ORDER);
     }
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index c8efbdaf4..a85de51bc 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -38,6 +38,7 @@ import android.provider.Contacts.Phones;
 import android.provider.Contacts.PhonesColumns;
 import android.provider.Settings;
 import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.PhoneStateListener;