Revert "Update AOSP Dialer source from internal google3 repository at cl/150622237"

This reverts commit 06b6b56e9eaa91ebf757ea641e38a9c885fa40bd.

Change-Id: Ida8c5ee67669524dc63b9adc60a6dd392cb9b9a6

1 files changed, 8 insertions, 12 deletions

diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java
index 35f7854ac..1f6bd5fb3 100644
--- a/java/com/android/dialer/database/CallLogQueryHandler.java
+++ b/java/com/android/dialer/database/CallLogQueryHandler.java
@@ -33,6 +33,7 @@ import android.os.Message;
 import android.provider.CallLog.Calls;
 import android.provider.VoicemailContract.Status;
 import android.provider.VoicemailContract.Voicemails;
+import android.support.v4.os.BuildCompat;
 import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.AppCompatConstants;
@@ -112,21 +113,14 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
   }
 
   public void fetchVoicemailStatus() {
-    StringBuilder where = new StringBuilder();
-    List<String> selectionArgs = new ArrayList<>();
-
-    VoicemailComponent.get(mContext)
-        .getVoicemailClient()
-        .appendOmtpVoicemailStatusSelectionClause(mContext, where, selectionArgs);
-
     if (TelecomUtil.hasReadWriteVoicemailPermissions(mContext)) {
       startQuery(
           QUERY_VOICEMAIL_STATUS_TOKEN,
           null,
           Status.CONTENT_URI,
           VoicemailStatusQuery.getProjection(),
-          where.toString(),
-          selectionArgs.toArray(new String[selectionArgs.size()]),
+          null,
+          null,
           null);
     }
   }
@@ -138,9 +132,11 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
           new StringBuilder(Voicemails.IS_READ + "=0" + " AND " + Voicemails.DELETED + "=0 ");
       List<String> selectionArgs = new ArrayList<>();
 
-      VoicemailComponent.get(mContext)
-          .getVoicemailClient()
-          .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs);
+      if (BuildCompat.isAtLeastO()) {
+        VoicemailComponent.get(mContext)
+            .getVoicemailClient()
+            .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs);
+      }
 
       startQuery(
           QUERY_VOICEMAIL_UNREAD_COUNT_TOKEN,