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

1 files changed, 5 insertions, 2 deletions

diff --git a/services/java/com/android/server/am/TaskRecord.java b/services/java/com/android/server/am/TaskRecord.java
index d03da20f2219..d79211ccf5b5 100644
--- a/services/java/com/android/server/am/TaskRecord.java
+++ b/services/java/com/android/server/am/TaskRecord.java
@@ -57,7 +57,7 @@ final class TaskRecord extends ThumbnailHolder {
     /** Current stack */
     ActivityStack stack;
 
-    private boolean mApplicationTask;
+    private boolean mApplicationTask = true;
 
     TaskRecord(int _taskId, ActivityInfo info, Intent _intent, ActivityStack _stack) {
         taskId = _taskId;
@@ -164,7 +164,10 @@ final class TaskRecord extends ThumbnailHolder {
             // Was not previously in list.
             numFullscreen++;
         }
-        mApplicationTask = r.isApplicationActivity();
+        // Only set this to be an application task if it has not already been set as home task.
+        if (mApplicationTask) {
+            mApplicationTask = r.isApplicationActivity();
+        }
         mActivities.add(index, r);
     }