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

Commit 7873300a authored by Craig Mautner's avatar Craig Mautner
Browse files

Don't change task type for launcher activities. 

When the launcher starts a new activity don't let it change the task
type. This would cause the stacks to get confused.

Fixes bug 9323103.

Change-Id: Ie1d9c3bf85461827c7255e68003f11ed5a38f63b
parent be4e6aaa

services/java/com/android/server/am/TaskRecord.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ final class TaskRecord extends ThumbnailHolder { 
    /** Current stack */

    /** Current stack */

    ActivityStack stack;

    ActivityStack stack;





    private boolean mApplicationTask;

    private boolean mApplicationTask = true;





    TaskRecord(int _taskId, ActivityInfo info, Intent _intent, ActivityStack _stack) {

    TaskRecord(int _taskId, ActivityInfo info, Intent _intent, ActivityStack _stack) {

        taskId = _taskId;

        taskId = _taskId;
@@ -164,7 +164,10 @@ final class TaskRecord extends ThumbnailHolder { 
            // Was not previously in list.

            // Was not previously in list.

            numFullscreen++;

            numFullscreen++;

        }

        }

        // Only set this to be an application task if it has not already been set as home task.

        if (mApplicationTask) {

            mApplicationTask = r.isApplicationActivity();

            mApplicationTask = r.isApplicationActivity();

        }

        mActivities.add(index, r);

        mActivities.add(index, r);

    }

    }