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

am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different..." into lmp-dev

Browse Source 
* commit 'da7e72b1c1f43fecc522727f42eb2fa01b6f8df4':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
This commit is contained in:
Dianne Hackborn
2014-09-20 00:33:10 +00:00
committed by Android Git Automerger
parent 8c99909fb5 000e464f30
commit 89de053753
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -2856,7 +2856,8 @@ final class ActivityStack {
// they need to re-create their task if this current activity is the root
// of a document, unless simply finishing it will return them to the the
// correct app behind.
if (srec.frontOfTask && srec.task != null) {
if (srec.frontOfTask && srec.task != null && srec.task.getBaseIntent() != null
&& srec.task.getBaseIntent().isDocument()) {
// Okay, this activity is at the root of its task. What to do, what to do...
if (srec.task.getTaskToReturnTo() != ActivityRecord.APPLICATION_ACTIVITY_TYPE) {
// Finishing won't return to an application, so we need to recreate.