diff options
| author | 2014-08-12 16:59:39 +0000 | |
|---|---|---|
| committer | 2014-08-11 18:15:12 +0000 | |
| commit | dc0afc91c24c217705d6d430aa7fabbd22b6d2b3 (patch) | |
| tree | 2c7b556070b1728ce4a018c9b2ee847512fdfdde | |
| parent | dafcc61078cca409abd77516ce7ccee1eb60db2a (diff) | |
| parent | 5073145f85c8197ec4387d5e2599442a7291ca9c (diff) | |
Merge "Fix a bug: unable to start activity when AM is killing the process."
| -rw-r--r-- | services/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java index cc9df7657c73..16eef00d3a89 100644 --- 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) { + if (app != null && app.thread != null && !app.killedByAm) { try { if ((r.info.flags&ActivityInfo.FLAG_MULTIPROCESS) == 0 || !"android".equals(r.info.packageName)) { |