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

Commit 87cff0ba authored by Winson's avatar Winson Committed by android-build-merger
Browse files

Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df8 

am: f654d3e0

Change-Id: I08322a664374d16829f87391c913e0aba44f3cfb
parents b8d43da6 f654d3e0

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

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ class RecentTasks extends ArrayList<TaskRecord> { 
        for (int i = 0; i < recentsCount; i++) {

            final TaskRecord tr = get(i);

            if (task != tr) {

                if (task.stack != tr.stack) {

                if (task.stack != null && tr.stack != null && task.stack != tr.stack) {

                    continue;

                }

                if (task.userId != tr.userId) {