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

Commit fc02074e authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

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

parents 325e2124 b546f7e0

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

+4 −0
Original line number Diff line number Diff line
@@ -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;