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

Commit b214cf99 authored by Neha Jain's avatar Neha Jain Committed by Automerger Merge Worker
Browse files

Merge "Fix TaskFragmentTrustedModeTest" into tm-dev am: 1664eecb 

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



Change-Id: I81ba909f0895251d512cf9f6ef03818f9be462e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 843566e6 1664eecb

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

+3 −16
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                }

                if (parent.isAllowedToEmbedActivity(activity) != EMBEDDING_ALLOWED) {

                    final Throwable exception = new SecurityException(

                            "The task fragment is not trusted to embed the given activity.");

                            "The task fragment is not allowed to embed the given activity.");

                    sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);

                    break;

                }
@@ -769,11 +769,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                    sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);

                    break;

                }

                if (parent.smallerThanMinDimension(activity)) {

                    sendMinimumDimensionViolation(parent, activity.getMinDimensions(),

                            errorCallbackToken, "reparentActivityToTask");

                    break;

                }



                activity.reparent(parent, POSITION_TOP);

                effects |= TRANSACT_EFFECTS_LIFECYCLE;
@@ -1583,10 +1578,10 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
            // We are reparenting activities to a new embedded TaskFragment, this operation is only

            // allowed if the new parent is trusted by all reparent activities.

            final boolean isEmbeddingDisallowed = oldParent.forAllActivities(activity ->

                    newParentTF.isAllowedToEmbedActivity(activity) == EMBEDDING_ALLOWED);

                    newParentTF.isAllowedToEmbedActivity(activity) != EMBEDDING_ALLOWED);

            if (isEmbeddingDisallowed) {

                final Throwable exception = new SecurityException(

                        "The new parent is not trusted to embed the activities.");

                        "The new parent is not allowed to embed the activities.");

                sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);

                return;

            }
@@ -1603,14 +1598,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
            sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);

            return;

        }

        final Point minDimensions = oldParent.calculateMinDimension();

        final Rect newParentBounds = newParentTF.getBounds();

        if (newParentBounds.width() < minDimensions.x

                || newParentBounds.height() < minDimensions.y) {

            sendMinimumDimensionViolation(newParentTF, minDimensions, errorCallbackToken,

                    "reparentTaskFragment");

            return;

        }

        while (oldParent.hasChild()) {

            oldParent.getChildAt(0).reparent(newParentTF, POSITION_TOP);

        }