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

2014-08-12 21:09:21 +00:00
parent dc0afc91c2 ca9ba58786
commit 67fe6d1f76
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@ -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)) {