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

Commit 36238928 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Avoid setting the same TaskDescription" into main

parents e214304b d2eb185d

core/java/android/app/Activity.java

+11 −9
Original line number Diff line number Diff line
@@ -7604,7 +7604,10 @@ public class Activity extends ContextThemeWrapper 
     * @param taskDescription The TaskDescription properties that describe the task with this activity

     */

    public void setTaskDescription(ActivityManager.TaskDescription taskDescription) {

        if (mTaskDescription != taskDescription) {

        if (taskDescription == null || mTaskDescription.equals(taskDescription)) {

            return;

        }



        mTaskDescription.copyFromPreserveHiddenFields(taskDescription);

        // Scale the icon down to something reasonable if it is provided

        if (taskDescription.getIconFilename() == null && taskDescription.getIcon() != null) {
@@ -7613,7 +7616,6 @@ public class Activity extends ContextThemeWrapper 
                    true);

            mTaskDescription.setIcon(Icon.createWithBitmap(icon));

        }

        }

        ActivityClient.getInstance().setTaskDescription(mToken, mTaskDescription);

    }