commit fc02074e0054fff351c03d3b62c48d2fc15380df
author Chong Zhang <chz@google.com> Thu Aug 06 20:17:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 06 20:17:57 2015 +0000
tree e69abdef1d664890f7bca65c79cb227410ff525e
parent 325e2124ab74d9ba931506fae6ea5b85d17105c9
parent b546f7e0d830c2be96eb6ded1c16d49b2429e6c9

Merge "Only launch an activity in an existing task if activity types match"

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 494ae6c..e083709 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -556,6 +556,10 @@
                 if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Skipping " + task + ": mismatch root " + r);
                 continue;
             }
+            if (r.mActivityType != target.mActivityType) {
+                if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Skipping " + task + ": mismatch activity type");
+                continue;
+            }
 
             final Intent taskIntent = task.intent;
             final Intent affinityIntent = task.affinityIntent;