diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-30 11:06:31 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-05-30 11:06:31 -0700 |
| commit | 5f48fca218a2a0f67d4f5290619a656419f26a43 (patch) | |
| tree | d4b52a5e85dcf7b65ca779a0c0e822bd02b55b9f /core/java/android/app/ActivityThread.java | |
| parent | aefe4aa4d470d308f17a71b16bf1a0d58c79c05c (diff) | |
| download | frameworks_base-5f48fca218a2a0f67d4f5290619a656419f26a43.zip frameworks_base-5f48fca218a2a0f67d4f5290619a656419f26a43.tar.gz frameworks_base-5f48fca218a2a0f67d4f5290619a656419f26a43.tar.bz2 | |
Fix issue #6579824: Email crash observed after updating...
...device from JRN59D to JRN60
Deal correctly with multiprocess content providers that need to
be loaded into a secondary process; wasn't correctly detecting the
case where the IContentProvider returned by the activity manager
is null. (installProvider used to be given the direct IContentProvider,
now it gets the ContentProviderHolder and much check whether the
provider inside is null.)
Change-Id: I888622e275a459031ab849952941f39cf9c02ee0
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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); |