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

Commit cb4e1cbe authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use currentUserId for showForAllUsers tasks in TaskInfo" into main

parents 67a79b2e cab882b3

core/java/android/window/TransitionInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,8 @@ public final class TransitionInfo implements Parcelable { 
                sb.append(mTaskInfo.parentTaskId);

                sb.append(" winMode=");

                sb.append(mTaskInfo.getWindowingMode());

                sb.append(" userId=");

                sb.append(mTaskInfo.userId);

            }

            if (mAnimationOptions != null) {

                sb.append(" opt=").append(mAnimationOptions);

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

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


    /** Returns the user id associated with the current task. */

    int getUserId() {

        return isLeafTask() ? mUserId : mCurrentUser;

        if (!isLeafTask()) return mCurrentUser;

        if (DesktopExperienceFlags.ENABLE_APPLY_DESK_ACTIVATION_ON_USER_SWITCH.isTrue()

                && showForAllUsers()) {

            return mCurrentUser;

        }

        return mUserId;

    }



    /**