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

Commit c35893d7 authored by Shubhi Saxena's avatar Shubhi Saxena Committed by Android (Google) Code Review
Browse files

Revert "Avoid setting the same TaskDescription" 

This reverts commit d2eb185d.

Reason for revert: breakage bug b/312671504

Change-Id: I9433ac004a181a278170aeca40d1d65c52e15bd8
parent d2eb185d

core/java/android/app/Activity.java

+9 −13
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL; 
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.inMultiWindowMode;

import static android.os.Process.myUid;



import static com.android.sdksandbox.flags.Flags.sandboxActivitySdkBasedContext;



import static java.lang.Character.MIN_VALUE;



import android.annotation.AnimRes;
@@ -7597,10 +7595,7 @@ public class Activity extends ContextThemeWrapper 
     * @param taskDescription The TaskDescription properties that describe the task with this activity

     */

    public void setTaskDescription(ActivityManager.TaskDescription taskDescription) {

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

            return;

        }



        if (mTaskDescription != taskDescription) {

            mTaskDescription.copyFromPreserveHiddenFields(taskDescription);

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

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

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

            }

        }

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

    }