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

Commit 83616704 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

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

parents f2166b37 e1b53c90

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()) {