commit 321d81dcc008d4d7b3ad02272960a9972a141c90
author Jay Shrauner <shrauner@google.com> Tue Jul 02 17:01:58 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 02 17:01:58 2013 +0000
tree 870291a4aa173d510f76df635edf48f0cbd32f4f
parent 75a0a0b0ece29241b4712126af53841d5dcdb442
parent b646ef018cff47aa5583b92b39bdb121b4bf45e5

Merge "Change method to determine if the table is empty"

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index c9c7f2f..2855305 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -1685,13 +1685,12 @@
         // No accounts/no contacts status is true if there are no account and
         // there are no contacts or one profile contact
         if (mContactsAccountCount == 0) {
-            long contactsNum = DatabaseUtils.queryNumEntries(mContactsHelper.getReadableDatabase(),
-                    Tables.CONTACTS, null);
+            boolean isContactsEmpty = DatabaseUtils.queryIsEmpty(mContactsHelper.getReadableDatabase(), Tables.CONTACTS);
             long profileNum = DatabaseUtils.queryNumEntries(mProfileHelper.getReadableDatabase(),
                     Tables.CONTACTS, null);
 
             // TODO: Different status if there is a profile but no contacts?
-            if (contactsNum == 0 && profileNum <= 1) {
+            if (isContactsEmpty && profileNum <= 1) {
                 setProviderStatus(ProviderStatus.STATUS_NO_ACCOUNTS_NO_CONTACTS);
             } else {
                 setProviderStatus(ProviderStatus.STATUS_NORMAL);