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

Commit b1326dac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RecentTasks:fix NPE problem to avoid system_server process crash." into... 

Merge "RecentTasks:fix NPE problem to avoid system_server process crash." into main am: 3b8ea133 am: dc174914

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3415677



Change-Id: If65551ea42218838b4423fc186e8b9a3068e3f17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 691a7a9d dc174914

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

+3 −3
Original line number Diff line number Diff line
@@ -1515,8 +1515,8 @@ class RecentTasks { 
            boolean skipExcludedCheck) {

        if (!skipExcludedCheck) {

            // Keep the most recent task of home display even if it is excluded from recents.

            final boolean isExcludeFromRecents =

                    (task.getBaseIntent().getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

            final boolean isExcludeFromRecents = task.getBaseIntent() != null

                    && (task.getBaseIntent().getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)

                    == FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

            if (isExcludeFromRecents) {

                if (DEBUG_RECENTS_TRIM_TASKS) {