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

* commit '67fe6d1f76a740147cc9c85487e8e70b53c744f8':
  Revert "Fix a bug: unable to start activity when AM is killing the process."
This commit is contained in:
Craig Mautner
2014-08-12 21:13:05 +00:00
committed by Android Git Automerger

View File

@@ -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)) {