commit 82cbade17d8610f0f02783e5a71fe9f2673d90be
author Andrew Lee <anwlee@google.com> Fri Jun 12 22:38:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 12 22:38:45 2015 +0000
tree 589eea08cd167a3a67f78cc39f1c170a046b2eb1
parent 6a0ba62d864d08223c09fe48b05497ee663443b1
parent d181ffab3cdb717598f57d6171cea3923317d566

am d181ffab: am af049afa: Merge "Don\'t include voicemails in ALL call type filter." into mnc-dev

* commit 'd181ffab3cdb717598f57d6171cea3923317d566':
  Don't include voicemails in ALL call type filter.

src/com/android/dialer/calllog/CallLogQueryHandler.java

diff --git a/src/com/android/dialer/calllog/CallLogQueryHandler.java b/src/com/android/dialer/calllog/CallLogQueryHandler.java
index a0e563a..60bdcff 100644
--- a/src/com/android/dialer/calllog/CallLogQueryHandler.java
+++ b/src/com/android/dialer/calllog/CallLogQueryHandler.java
@@ -64,7 +64,7 @@
 
     /**
      * Call type similar to Calls.INCOMING_TYPE used to specify all types instead of one particular
-     * type.
+     * type. Exception: excludes Calls.VOICEMAIL_TYPE.
      */
     public static final int CALL_TYPE_ALL = -1;
 
@@ -167,10 +167,11 @@
 
         if (callType > CALL_TYPE_ALL) {
             where.append(" AND ");
-            // Add a clause to fetch only items of type voicemail.
             where.append(String.format("(%s = ?)", Calls.TYPE));
-            // Add a clause to fetch only items newer than the requested date
             selectionArgs.add(Integer.toString(callType));
+        } else {
+            where.append(" AND NOT ");
+            where.append("(" + Calls.TYPE + " = " + Calls.VOICEMAIL_TYPE + ")");
         }
 
         if (newerThan > 0) {