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

Commit d5555da3 authored by Chris Li's avatar Chris Li
Browse files

Allow TaskFragmentOrganizer to apply WCT without permission 

TaskFragmentOrganizer will be used by regular apps without the
permission to manage Task. We are allow it to apply transactions if it
is operating on TaskFragment that is organized by itself.

Bug: 193191599
Test: atest WmTests:TaskFragmentOrganizerControllerTest
Change-Id: I82e5d49260680bd496ff184c6795ec817c65d858
parent 2f7eef82

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3256,8 +3256,8 @@ package android.window { 


  public class WindowOrganizer {

    ctor public WindowOrganizer();

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_ACTIVITY_TASKS, conditional=true) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);

    method @RequiresPermission(value=android.Manifest.permission.MANAGE_ACTIVITY_TASKS, conditional=true) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);

  }



  @UiContext public abstract class WindowProviderService extends android.app.Service {

core/java/android/window/DisplayAreaOrganizer.java

+1 −1
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ public class DisplayAreaOrganizer extends WindowOrganizer { 
        }

    };



    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    private IDisplayAreaOrganizerController getController() {

        try {

            return getWindowOrganizerController().getDisplayAreaOrganizerController();
@@ -272,5 +273,4 @@ public class DisplayAreaOrganizer extends WindowOrganizer { 
            return null;

        }

    }



}

core/java/android/window/TaskFragmentOrganizer.java

+13 −0
Original line number Diff line number Diff line
@@ -120,6 +120,19 @@ public class TaskFragmentOrganizer extends WindowOrganizer { 
    public void onTaskFragmentError(

            @NonNull IBinder errorCallbackToken, @NonNull Throwable exception) {}



    @Override

    public void applyTransaction(@NonNull WindowContainerTransaction t) {

        t.setTaskFragmentOrganizer(mInterface);

        super.applyTransaction(t);

    }



    @Override

    public int applySyncTransaction(@NonNull WindowContainerTransaction t,

            @NonNull WindowContainerTransactionCallback callback) {

        t.setTaskFragmentOrganizer(mInterface);

        return super.applySyncTransaction(t, callback);

    }



    private final ITaskFragmentOrganizer mInterface = new ITaskFragmentOrganizer.Stub() {

        @Override

        public void onTaskFragmentAppeared(@NonNull TaskFragmentAppearedInfo taskFragmentInfo) {

core/java/android/window/TaskOrganizer.java

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ public class TaskOrganizer extends WindowOrganizer { 
        }

    };



    @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    private ITaskOrganizerController getController() {

        try {

            return getWindowOrganizerController().getTaskOrganizerController();

core/java/android/window/WindowContainerTransaction.java

+47 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.List;

import java.util.Map;

import java.util.Objects;



/**

 * Represents a collection of operations on some WindowContainers that should be applied all at
@@ -52,12 +53,16 @@ public final class WindowContainerTransaction implements Parcelable { 
    @Nullable

    private IBinder mErrorCallbackToken;



    @Nullable

    private ITaskFragmentOrganizer mTaskFragmentOrganizer;



    public WindowContainerTransaction() {}



    private WindowContainerTransaction(Parcel in) {

        in.readMap(mChanges, null /* loader */);

        in.readList(mHierarchyOps, null /* loader */);

        mErrorCallbackToken = in.readStrongBinder();

        mTaskFragmentOrganizer = ITaskFragmentOrganizer.Stub.asInterface(in.readStrongBinder());

    }



    private Change getOrCreateChange(IBinder token) {
@@ -473,7 +478,7 @@ public final class WindowContainerTransaction implements Parcelable { 
        final HierarchyOp hierarchyOp =

                new HierarchyOp.Builder(HierarchyOp.HIERARCHY_OP_TYPE_REPARENT_CHILDREN)

                        .setContainer(oldParent.asBinder())

                        .setReparentContainer(newParent.asBinder())

                        .setReparentContainer(newParent != null ? newParent.asBinder() : null)

                        .build();

        mHierarchyOps.add(hierarchyOp);

        return this;
@@ -496,6 +501,23 @@ public final class WindowContainerTransaction implements Parcelable { 
        return this;

    }



    /**

     * Sets the {@link TaskFragmentOrganizer} that applies this {@link WindowContainerTransaction}.

     * When this is set, the server side will not check for the permission of

     * {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS}, but will ensure this WCT only

     * contains operations that are allowed for this organizer, such as modifying TaskFragments that

     * are organized by this organizer.

     * @hide

     */

    @NonNull

    WindowContainerTransaction setTaskFragmentOrganizer(@NonNull ITaskFragmentOrganizer organizer) {

        if (mTaskFragmentOrganizer != null) {

            throw new IllegalStateException("Can't set multiple organizers for one transaction.");

        }

        mTaskFragmentOrganizer = organizer;

        return this;

    }



    /**

     * Merges another WCT into this one.

     * @param transfer When true, this will transfer everything from other potentially leaving
@@ -519,7 +541,17 @@ public final class WindowContainerTransaction implements Parcelable { 
        }

        if (mErrorCallbackToken != null && other.mErrorCallbackToken != null && mErrorCallbackToken

                != other.mErrorCallbackToken) {

            throw new IllegalArgumentException("Can't merge two WCT with different error token");

            throw new IllegalArgumentException("Can't merge two WCTs with different error token");

        }

        final IBinder taskFragmentOrganizerAsBinder = mTaskFragmentOrganizer != null

                ? mTaskFragmentOrganizer.asBinder()

                : null;

        final IBinder otherTaskFragmentOrganizerAsBinder = other.mTaskFragmentOrganizer != null

                ? other.mTaskFragmentOrganizer.asBinder()

                : null;

        if (!Objects.equals(taskFragmentOrganizerAsBinder, otherTaskFragmentOrganizerAsBinder)) {

            throw new IllegalArgumentException(

                    "Can't merge two WCTs from different TaskFragmentOrganizers");

        }

        mErrorCallbackToken = mErrorCallbackToken != null

                ? mErrorCallbackToken
@@ -547,11 +579,21 @@ public final class WindowContainerTransaction implements Parcelable { 
        return mErrorCallbackToken;

    }



    /** @hide */

    @Nullable

    public ITaskFragmentOrganizer getTaskFragmentOrganizer() {

        return mTaskFragmentOrganizer;

    }



    @Override

    @NonNull

    public String toString() {

        return "WindowContainerTransaction { changes = " + mChanges + " hops = " + mHierarchyOps

                + " errorCallbackToken=" + mErrorCallbackToken + " }";

        return "WindowContainerTransaction {"

                + " changes = " + mChanges

                + " hops = " + mHierarchyOps

                + " errorCallbackToken=" + mErrorCallbackToken

                + " taskFragmentOrganizer=" + mTaskFragmentOrganizer

                + " }";

    }



    @Override
@@ -560,6 +602,7 @@ public final class WindowContainerTransaction implements Parcelable { 
        dest.writeMap(mChanges);

        dest.writeList(mHierarchyOps);

        dest.writeStrongBinder(mErrorCallbackToken);

        dest.writeStrongInterface(mTaskFragmentOrganizer);

    }



    @Override