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

Commit 57060059 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Task#setTaskDescriptionFromActivityAboveRoot: skip NoDisplay activities." into main

parents 2184c052 67ac8787

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

+1 −1
Original line number Diff line number Diff line
@@ -2014,7 +2014,7 @@ class Task extends TaskFragment { 


    private static boolean setTaskDescriptionFromActivityAboveRoot(

            ActivityRecord r, ActivityRecord root, TaskDescription td) {

        if (!r.isTaskOverlay() && r.taskDescription != null) {

        if (!r.isTaskOverlay() && !r.isNoDisplay() && r.taskDescription != null) {

            final TaskDescription atd = r.taskDescription;

            if (td.getLabel() == null) {

                td.setLabel(atd.getLabel());