commit f46bd06c6822752acd24265a7db5c86d6036bc38
author Dianne Hackborn <hackbod@google.com> Wed May 30 11:18:33 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 30 11:18:33 2012 -0700
tree 0b8209c39b4a186737e3dc6ca336331ff4fa5db8
parent 26627ccc3f20ad353cf7c48c0488699c26e69a0b
parent 5f48fca218a2a0f67d4f5290619a656419f26a43

Merge "Fix issue #6579824: Email crash observed after updating..." into jb-dev

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index a457e3c..7242029 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4516,7 +4516,7 @@
             boolean noisy, boolean noReleaseNeeded, boolean stable) {
         ContentProvider localProvider = null;
         IContentProvider provider;
-        if (holder == null) {
+        if (holder == null || holder.provider == null) {
             if (DEBUG_PROVIDER || noisy) {
                 Slog.d(TAG, "Loading provider " + info.authority + ": "
                         + info.name);