Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ba8af88 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge ""Fix" issue #112467931: APR: WTF in ActivityManager:..." into qt-dev 

am: 88917458

Change-Id: I512c7594a369a5ba92cfad0caad2cc17209ed03d
parents eb40838f 88917458

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -7299,6 +7299,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    if (wasInLaunchingProviders) {

                        mHandler.removeMessages(CONTENT_PROVIDER_PUBLISH_TIMEOUT_MSG, r);

                    }

                    // Make sure the package is associated with the process.

                    // XXX We shouldn't need to do this, since we have added the package

                    // when we generated the providers in generateApplicationProvidersLocked().

                    // But for some reason in some cases we get here with the package no longer

                    // added...  for now just patch it in to make things happy.

                    r.addPackage(dst.info.applicationInfo.packageName,

                            dst.info.applicationInfo.longVersionCode, mProcessStats);

                    synchronized (dst) {

                        dst.provider = src.provider;

                        dst.setProcess(r);