[Issue 2156901] Fixing update of the "starred" flag on raw contacts

Change-Id: I737a6e1a428edaa16c108bbbf5d4a461035560d4

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/providers/contacts/ContactAggregator.java b/src/com/android/providers/contacts/ContactAggregator.java
index 7e18fd9a..afecf411 100644
--- a/src/com/android/providers/contacts/ContactAggregator.java
+++ b/src/com/android/providers/contacts/ContactAggregator.java
@@ -1492,9 +1492,14 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator
 
     /**
      * Execute {@link SQLiteStatement} that will update the
-     * {@link Contacts#STARRED} flag for the given {@link Contacts#_ID}.
+     * {@link Contacts#STARRED} flag for the given {@link RawContacts#_ID}.
      */
-    protected void updateStarred(long contactId) {
+    protected void updateStarred(long rawContactId) {
+        long contactId = mDbHelper.getContactId(rawContactId);
+        if (contactId == 0) {
+            return;
+        }
+
         mStarredUpdate.bindLong(1, contactId);
         mStarredUpdate.execute();
     }