Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89de0537 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am da7e72b1: Merge "Fix issue #17492300: NavUtils.shouldUpRecreateTask returns... 

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

* commit 'da7e72b1c1f43fecc522727f42eb2fa01b6f8df4':
  Fix issue #17492300: NavUtils.shouldUpRecreateTask returns different...
parents 8c99909f 000e464f

services/core/java/com/android/server/am/ActivityStack.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -2856,7 +2856,8 @@ final class ActivityStack { 
        // they need to re-create their task if this current activity is the root

        // 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

        // of a document, unless simply finishing it will return them to the the

        // correct app behind.

        // 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...

            // Okay, this activity is at the root of its task.  What to do, what to do...

            if (srec.task.getTaskToReturnTo() != ActivityRecord.APPLICATION_ACTIVITY_TYPE) {

            if (srec.task.getTaskToReturnTo() != ActivityRecord.APPLICATION_ACTIVITY_TYPE) {

                // Finishing won't return to an application, so we need to recreate.

                // Finishing won't return to an application, so we need to recreate.