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

Commit 3b8ea133 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 3ffcbdc1 d20a111d

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

+3 −3
Original line number Diff line number Diff line
@@ -1488,8 +1488,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) {