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

Commit fa23f600 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Report resizeTask failure as boolean result 

Previously ActivityTaskManagerService#resizeTask throws
IllegalArgumentException when the task windowing mode is not suitable for
resize. However caller cannot ensure the windowing mode before
acquiring window lock.

To descriminate windowing mode mismatch from programming errors
(e.g. Preconditions.check failures), the CL changes the way of reporting
windowing mode mismatch to returning boolean value.

Bug: 156196109
Test: None
Change-Id: I36f473899c4f6d7f5d5d25f081a57fe14ebbb1a8
parent 54dd86ac

core/java/android/app/IActivityTaskManager.aidl

+10 −1
Original line number Diff line number Diff line
@@ -229,7 +229,16 @@ interface IActivityTaskManager { 
    void unregisterTaskStackListener(in ITaskStackListener listener);

    void setTaskResizeable(int taskId, int resizeableMode);

    void toggleFreeformWindowingMode(in IBinder token);

    void resizeTask(int taskId, in Rect bounds, int resizeMode);



    /**

     * Resize the task with given bounds

     *

     * @param taskId The id of the task to set the bounds for.

     * @param bounds The new bounds.

     * @param resizeMode Resize mode defined as {@code ActivityTaskManager#RESIZE_MODE_*} constants.

     * @return Return true on success. Otherwise false.

     */

    boolean resizeTask(int taskId, in Rect bounds, int resizeMode);

    void moveStackToDisplay(int stackId, int displayId);

    void removeStack(int stackId);

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

+5 −4
Original line number Diff line number Diff line
@@ -3319,7 +3319,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    }



    @Override

    public void resizeTask(int taskId, Rect bounds, int resizeMode) {

    public boolean resizeTask(int taskId, Rect bounds, int resizeMode) {

        mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "resizeTask()");

        long ident = Binder.clearCallingIdentity();

        try {
@@ -3328,10 +3328,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                        MATCH_TASK_IN_STACKS_ONLY);

                if (task == null) {

                    Slog.w(TAG, "resizeTask: taskId=" + taskId + " not found");

                    return;

                    return false;

                }

                if (!task.getWindowConfiguration().canResizeTask()) {

                    throw new IllegalArgumentException("resizeTask not allowed on task=" + task);

                    Slog.w(TAG, "resizeTask not allowed on task=" + task);

                    return false;

                }



                // Reparent the task to the right stack if necessary
@@ -3339,7 +3340,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


                // After reparenting (which only resizes the task to the stack bounds), resize the

                // task to the actual bounds provided

                task.resize(bounds, resizeMode, preserveWindow);

                return task.resize(bounds, resizeMode, preserveWindow);

            }

        } finally {

            Binder.restoreCallingIdentity(ident);