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

Merge "Fix TaskFragmentTrustedModeTest" into tm-dev

Browse Source
This commit is contained in:
Neha Jain
2022-07-12 22:22:49 +00:00
committed by Android (Google) Code Review
parent 9ec047d918 c231302191
commit 1664eecb70
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -759,7 +759,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
} }
if (parent.isAllowedToEmbedActivity(activity) != EMBEDDING_ALLOWED) { if (parent.isAllowedToEmbedActivity(activity) != EMBEDDING_ALLOWED) {
final Throwable exception = new SecurityException( 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); sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);
break; break;
} }
@@ -769,11 +769,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception); sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);
break; break;
} }
if (parent.smallerThanMinDimension(activity)) {
sendMinimumDimensionViolation(parent, activity.getMinDimensions(),
errorCallbackToken, "reparentActivityToTask");
break;
}
activity.reparent(parent, POSITION_TOP); activity.reparent(parent, POSITION_TOP);
effects |= TRANSACT_EFFECTS_LIFECYCLE; 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 // We are reparenting activities to a new embedded TaskFragment, this operation is only
// allowed if the new parent is trusted by all reparent activities. // allowed if the new parent is trusted by all reparent activities.
final boolean isEmbeddingDisallowed = oldParent.forAllActivities(activity -> final boolean isEmbeddingDisallowed = oldParent.forAllActivities(activity ->
newParentTF.isAllowedToEmbedActivity(activity) == EMBEDDING_ALLOWED); newParentTF.isAllowedToEmbedActivity(activity) != EMBEDDING_ALLOWED);
if (isEmbeddingDisallowed) { if (isEmbeddingDisallowed) {
final Throwable exception = new SecurityException( 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); sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);
return; return;
} }
@@ -1603,14 +1598,6 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception); sendTaskFragmentOperationFailure(organizer, errorCallbackToken, exception);
return; 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()) { while (oldParent.hasChild()) {
oldParent.getChildAt(0).reparent(newParentTF, POSITION_TOP); oldParent.getChildAt(0).reparent(newParentTF, POSITION_TOP);
} }