Skip to content

Commit 5f48fca

Browse files
author
Dianne Hackborn
committed
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
1 parent aefe4aa commit 5f48fca

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

core/java/android/app/ActivityThread.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4516,7 +4516,7 @@ private IActivityManager.ContentProviderHolder installProvider(Context context,
45164516
boolean noisy, boolean noReleaseNeeded, boolean stable) {
45174517
ContentProvider localProvider = null;
45184518
IContentProvider provider;
4519-
if (holder == null) {
4519+
if (holder == null || holder.provider == null) {
45204520
if (DEBUG_PROVIDER || noisy) {
45214521
Slog.d(TAG, "Loading provider " + info.authority + ": "
45224522
+ info.name);

0 commit comments

Comments
 (0)