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

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

Browse Source 
* commit 'dc0afc91c24c217705d6d430aa7fabbd22b6d2b3':
  Fix a bug: unable to start activity when AM is killing the process.
This commit is contained in:
Craig Mautner
2014-08-12 17:05:11 +00:00
committed by Android Git Automerger
parent 8432e77baa dc0afc91c2
commit 379135d3d0
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);
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)) {