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

2015-08-06 20:17:57 +00:00
parent 325e2124ab b546f7e0d8
commit fc02074e00
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -556,6 +556,10 @@ final class ActivityStack {
                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;