Commit ca9ba587 authored Aug 12, 2014 by Craig Mautner

Revert "Fix a bug: unable to start activity when AM is killing the process."

This reverts commit 5073145f.

I spoke to Dianne and she said that if this is making a problem go away then it is only hiding it and there is a deeper problem we need to fix.

I think if killedByApp is true then we should set app and app.thread to null. I'll look at it further when I have more time.

Change-Id: I44c29e15ca654666440472eab2d2af1c5af80b9a

parent 5073145f

services/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1050,7 +1050,7 @@ public final class ActivityStackSupervisor {

		r.task.stack.setLaunchTime(r);

		if (app != null && app.thread != null && !app.killedByAm) {
		if (app != null && app.thread != null) {
		try {
		if ((r.info.flags&ActivityInfo.FLAG_MULTIPROCESS) == 0
		\|\| !"android".equals(r.info.packageName)) {