commit 6ce17205d1bc6da62b196fd08d5bfd1b0471557a
author Makoto Onuki <omakoto@google.com> Fri May 15 20:11:17 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 15 20:11:17 2015 +0000
tree f46816cf3450e4a5fcf415e5d52da934dc7d7986
parent 4f2b0708448e477ecac9f657fc5cb910eb07f2de
parent 2d66b50b00603e1b54da45aa1129e6bc659fd46d

am 2d66b50b: Merge "Clean up permissions" into mnc-dev

* commit '2d66b50b00603e1b54da45aa1129e6bc659fd46d':
  Clean up permissions

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);