commit 649e21353fb0f526a13401d8eac30a266315db9c
author Yorke Lee <yorkelee@google.com> Thu May 28 22:35:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 28 22:35:08 2015 +0000
tree 65b3cb9e45f5682dcae4c86c088b7cd81421ef6e
parent c9d68371fd908b2bfb447de2487cbebb21f71ba7
parent f22f9aff9a6f856c6ed9c32c294d362f73be5e8a

am f22f9aff: Merge "Add READ_PHONE_STATE to CP2" into mnc-dev

* commit 'f22f9aff9a6f856c6ed9c32c294d362f73be5e8a':
  Add READ_PHONE_STATE to CP2

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

diff --git a/src/com/android/providers/contacts/AbstractContactsProvider.java b/src/com/android/providers/contacts/AbstractContactsProvider.java
index 226652e..6f84df5 100644
--- a/src/com/android/providers/contacts/AbstractContactsProvider.java
+++ b/src/com/android/providers/contacts/AbstractContactsProvider.java
@@ -278,11 +278,15 @@
         }
         ContactsTransaction transaction = mTransactionHolder.get();
         if (transaction != null && (!transaction.isBatch() || callerIsBatch)) {
+            boolean notify = false;
             try {
                 if (transaction.isDirty()) {
-                    notifyChange();
+                    notify = true;
                 }
                 transaction.finish(callerIsBatch);
+                if (notify) {
+                    notifyChange();
+                }
             } finally {
                 // No matter what, make sure we clear out the thread-local transaction reference.
                 mTransactionHolder.set(null);