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

Commit 9a610cae authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Only allow resizeable Activity to create TaskFragment" into sc-v2-dev am: 83616704 

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

Change-Id: I70d1b6eeba79d9e289a624057acc45e50a40c043
parents adde6710 83616704

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

+6 −0
Original line number Diff line number Diff line
@@ -1177,6 +1177,12 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
            sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);

            return;

        }

        if (!ownerActivity.isResizeable()) {

            final IllegalArgumentException exception = new IllegalArgumentException("Not allowed"

                    + " to operate with non-resizable owner Activity");

            sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);

            return;

        }

        // The ownerActivity has to belong to the same app as the root Activity of the target Task.

        final ActivityRecord rootActivity = ownerActivity.getTask().getRootActivity();

        if (rootActivity.getUid() != ownerActivity.getUid()) {