commit 4f2b0708448e477ecac9f657fc5cb910eb07f2de
author Yorke Lee <yorkelee@google.com> Fri May 15 00:37:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 15 00:37:24 2015 +0000
tree e8c788e2442d7a61cc3079b20c974303e1dd2034
parent adbcd27ed3707343cf69ab4dd2011664eeb54e7a
parent 64605820a3c27ca1d1bf2499aea8418bb80621d0

am 64605820: Fix NPE in CallLogProviderWorker

* commit '64605820a3c27ca1d1bf2499aea8418bb80621d0':
  Fix NPE in CallLogProviderWorker

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