Commit 858ca242 authored Feb 18, 2020 by Alan Stokes

Don't kill a new process for the sins of an old process.

I have a test which instruments com.android.vending, which contains
some content providers.  Each test case starts the app and then fairly
quickly kills it. I doubt it ever gets to the stage where the content
providers are working.

When the test runs slowly enough, a new instance of the app gets
killed 10s after an old instance was started, which breaks
things. That seems like the wrong behavior in general, although it
should be rare.

This change attempts to prevent that happening by cleaning up any old
timeout messages for the app when we restart it.

Bug: 149150665
Test: atest FrameworksCoreTests:android.content.ContentResolverTest
Change-Id: I1b04eab6b0fd3d24c0a2ee315818d58de4c5915d

parent 16c028fe

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14605,6 +14605,11 @@ public class ActivityManagerService extends IActivityManager.Stub
	if (index < 0) {		if (index < 0) {
	ProcessList.remove(app.pid);		ProcessList.remove(app.pid);
	}		}

			// Remove provider publish timeout because we will start a new timeout when the
			// restarted process is attaching (if the process contains launching providers).
			mHandler.removeMessages(CONTENT_PROVIDER_PUBLISH_TIMEOUT_MSG, app);

	mProcessList.addProcessNameLocked(app);		mProcessList.addProcessNameLocked(app);
	app.pendingStart = false;		app.pendingStart = false;
	mProcessList.startProcessLocked(app,		mProcessList.startProcessLocked(app,