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

Commit 9dcabd4a authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge "Revert "Avoid setting the same TaskDescription"" into main

parents 5a852866 c35893d7

core/java/android/app/Activity.java

+9 −13
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW; 
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;
@@ -7604,10 +7602,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) {
@@ -7616,6 +7611,7 @@ public class Activity extends ContextThemeWrapper 
                        true);

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

            }

        }

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

    }