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

Commit 314f72a7 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-qpr-dev am: 19504bf7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21389013



Change-Id: I5f19b67efa13888817fb1429d20c6e7250dc3ac2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68abcce4 19504bf7

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3465,7 +3465,7 @@ package android.window { 


  public class WindowOrganizer {

    ctor public WindowOrganizer();

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

    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) 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);

  }

core/java/android/window/WindowOrganizer.java

+2 −5
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ public class WindowOrganizer { 
     * Apply multiple WindowContainer operations at once.

     *

     * Note that using this API requires the caller to hold

     * {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS}, unless the caller is using

     * {@link TaskFragmentOrganizer}, in which case it is allowed to change TaskFragment that is

     * created by itself.

     * {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS}.

     *

     * @param t The transaction to apply.

     * @param callback This transaction will use the synchronization scheme described in
@@ -72,8 +70,7 @@ public class WindowOrganizer { 
     * @return An ID for the sync operation which will later be passed to transactionReady callback.

     *         This lets the caller differentiate overlapping sync operations.

     */

    @RequiresPermission(value = android.Manifest.permission.MANAGE_ACTIVITY_TASKS,

            conditional = true)

    @RequiresPermission(value = android.Manifest.permission.MANAGE_ACTIVITY_TASKS)

    public int applySyncTransaction(@NonNull WindowContainerTransaction t,

            @NonNull WindowContainerTransactionCallback callback) {

        try {