Merge "Implemented blocked numbers migration" into nyc-dev
diff --git a/src/com/android/dialer/calllog/CallLogQueryHandler.java b/src/com/android/dialer/calllog/CallLogQueryHandler.java
index d1591e1..cf86bad 100644
--- a/src/com/android/dialer/calllog/CallLogQueryHandler.java
+++ b/src/com/android/dialer/calllog/CallLogQueryHandler.java
@@ -168,8 +168,10 @@
public void fetchVoicemailUnreadCount() {
if (TelecomUtil.hasReadWriteVoicemailPermissions(mContext)) {
+ // Only count voicemails that have not been read and have not been deleted.
startQuery(QUERY_VOICEMAIL_UNREAD_COUNT_TOKEN, null, Voicemails.CONTENT_URI,
- new String[] { Voicemails._ID }, Voicemails.IS_READ + "=0", null, null);
+ new String[] { Voicemails._ID },
+ Voicemails.IS_READ + "=0" + " AND " + Voicemails.DELETED + "=0", null, null);
}
}
diff --git a/tools/gradle/settings.gradle b/tools/gradle/settings.gradle
index 24d5e33..fdccfb5 100644
--- a/tools/gradle/settings.gradle
+++ b/tools/gradle/settings.gradle
@@ -57,4 +57,7 @@
include 'dialer'
project(':dialer').projectDir = new File(rootDir, 'packages/apps/Dialer')
-project(':dialer').buildFileName = 'build-app.gradle'
+project(':dialer').buildFileName = 'build-library.gradle'
+
+include 'googledialer'
+project(':googledialer').projectDir = new File(rootDir, 'vendor/unbundled_google/packages/GoogleDialer')
\ No newline at end of file