Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-qpr-dev

Browse Source
This commit is contained in:
Chris Li
2023-02-14 05:23:16 +00:00
committed by Android (Google) Code Review
parent cc1eccc4ab 65ac64c347
commit 19504bf76e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/test-current.txt
View File

@@ -3452,7 +3452,7 @@ package android.window {
public class WindowOrganizer { public class WindowOrganizer {
ctor public 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); method @RequiresPermission(value=android.Manifest.permission.MANAGE_ACTIVITY_TASKS, conditional=true) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);
} }

7
core/java/android/window/WindowOrganizer.java
View File

@@ -61,9 +61,7 @@ public class WindowOrganizer {
* Apply multiple WindowContainer operations at once. * Apply multiple WindowContainer operations at once.
* *
* Note that using this API requires the caller to hold * Note that using this API requires the caller to hold
* {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS}, unless the caller is using * {@link android.Manifest.permission#MANAGE_ACTIVITY_TASKS}.
* {@link TaskFragmentOrganizer}, in which case it is allowed to change TaskFragment that is
* created by itself.
* *
* @param t The transaction to apply. * @param t The transaction to apply.
* @param callback This transaction will use the synchronization scheme described in * @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. * @return An ID for the sync operation which will later be passed to transactionReady callback.
* This lets the caller differentiate overlapping sync operations. * This lets the caller differentiate overlapping sync operations.
*/ */
@RequiresPermission(value = android.Manifest.permission.MANAGE_ACTIVITY_TASKS, @RequiresPermission(value = android.Manifest.permission.MANAGE_ACTIVITY_TASKS)
conditional = true)
public int applySyncTransaction(@NonNull WindowContainerTransaction t, public int applySyncTransaction(@NonNull WindowContainerTransaction t,
@NonNull WindowContainerTransactionCallback callback) { @NonNull WindowContainerTransactionCallback callback) {
try { try {