am 379135d3: am dc0afc91: Merge "Fix a bug: unable to start activity when AM is killi...

[android-x86/frameworks-base.git] / services / core / java / com / android / server / am / ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 4a99ef3..1e2ae5a 100644 (file)
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1217,7 +1217,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
 
         r.task.stack.setLaunchTime(r);
 
-        if (app != null && app.thread != null) {
+        if (app != null && app.thread != null && !app.killedByAm) {
             try {
                 if ((r.info.flags&ActivityInfo.FLAG_MULTIPROCESS) == 0
                         || !"android".equals(r.info.packageName)) {