Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2014-08-12 16:59:39 +00:00
committed by Gerrit Code Review
parent dafcc61078 5073145f85
commit dc0afc91c2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1050,7 +1050,7 @@ public final class ActivityStackSupervisor {
r.task.stack.setLaunchTime(r); r.task.stack.setLaunchTime(r);
if (app != null && app.thread != null) { if (app != null && app.thread != null && !app.killedByAm) {
try { try {
if ((r.info.flags&ActivityInfo.FLAG_MULTIPROCESS) == 0 if ((r.info.flags&ActivityInfo.FLAG_MULTIPROCESS) == 0
|| !"android".equals(r.info.packageName)) { || !"android".equals(r.info.packageName)) {