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

Commit 67ac8787 authored by Ben Lin's avatar Ben Lin
Browse files

Task#setTaskDescriptionFromActivityAboveRoot: skip NoDisplay activities. 

Given that task description contains elements such as background color,
using activities set to NoDisplay theme (which the color is inherited
from) results in a quick black flash if going to a different activity -
which most trampoline activities do. Skip grabbing task description from
these activities.

Bug: 403497710
Test: Manual - opening activities with NoDisplay theme no longer
flickers a black bar.
Flag: EXEMPT bugfix

Change-Id: I2155fedad98d5e51ae8e7b049487ba92c0dba47a
parent 313e2f17

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());