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

* commit 'f46bd06c6822752acd24265a7db5c86d6036bc38': Fix issue #6579824: Email crash observed after updating...
2012-05-30 11:20:51 -07:00
parent defc301908 f46bd06c68
commit 2e73f4c059
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4516,7 +4516,7 @@ public final class ActivityThread {
            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);