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

Merge "Do not add layout reason if there is no config effect" into tm-qpr-dev

Browse Source
This commit is contained in:
Riddle Hsu
2022-06-10 03:06:11 +00:00
committed by Android (Google) Code Review
parent 445190d7ec 698d9d0ca5
commit 5eb759d2c0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java
View File

@@ -470,6 +470,8 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr
.setException(exception) .setException(exception)
.build(); .build();
mPendingTaskFragmentEvents.add(pendingEvent); mPendingTaskFragmentEvents.add(pendingEvent);
// Make sure the error event will be dispatched if there are no other changes.
mAtmService.mWindowManager.mWindowPlacerLocked.requestTraversal();
} }
void onActivityReparentToTask(ActivityRecord activity) { void onActivityReparentToTask(ActivityRecord activity) {

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

@@ -525,7 +525,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
} }
} }
if ((effects & TRANSACT_EFFECTS_CLIENT_CONFIG) == 0) { if ((effects & TRANSACT_EFFECTS_CLIENT_CONFIG) != 0) {
mService.addWindowLayoutReasons(LAYOUT_REASON_CONFIG_CHANGED); mService.addWindowLayoutReasons(LAYOUT_REASON_CONFIG_CHANGED);
} }
} finally { } finally {

6
services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
View File

@@ -922,13 +922,14 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
.build(); .build();
doReturn(true).when(mTaskFragment).isAllowedToEmbedActivity(activity); doReturn(true).when(mTaskFragment).isAllowedToEmbedActivity(activity);
mWindowOrganizerController.mLaunchTaskFragments.put(mFragmentToken, mTaskFragment); mWindowOrganizerController.mLaunchTaskFragments.put(mFragmentToken, mTaskFragment);
clearInvocations(mAtm.mRootWindowContainer);
// Reparent activity to mTaskFragment, which is smaller than activity's // Reparent activity to mTaskFragment, which is smaller than activity's
// minimum dimensions. // minimum dimensions.
mTransaction.reparentActivityToTaskFragment(mFragmentToken, activity.token) mTransaction.reparentActivityToTaskFragment(mFragmentToken, activity.token)
.setErrorCallbackToken(mErrorToken); .setErrorCallbackToken(mErrorToken);
mWindowOrganizerController.applyTransaction(mTransaction); mWindowOrganizerController.applyTransaction(mTransaction);
// The pending event will be dispatched on the handler (from requestTraversal).
waitHandlerIdle(mWm.mAnimationHandler);
verify(mOrganizer).onTaskFragmentError(eq(mErrorToken), any(SecurityException.class)); verify(mOrganizer).onTaskFragmentError(eq(mErrorToken), any(SecurityException.class));
} }
@@ -958,7 +959,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
doReturn(true).when(mTaskFragment).isAllowedToEmbedActivity(activity); doReturn(true).when(mTaskFragment).isAllowedToEmbedActivity(activity);
mWindowOrganizerController.mLaunchTaskFragments.put(oldFragToken, oldTaskFrag); mWindowOrganizerController.mLaunchTaskFragments.put(oldFragToken, oldTaskFrag);
mWindowOrganizerController.mLaunchTaskFragments.put(mFragmentToken, mTaskFragment); mWindowOrganizerController.mLaunchTaskFragments.put(mFragmentToken, mTaskFragment);
clearInvocations(mAtm.mRootWindowContainer);
// Reparent oldTaskFrag's children to mTaskFragment, which is smaller than activity's // Reparent oldTaskFrag's children to mTaskFragment, which is smaller than activity's
// minimum dimensions. // minimum dimensions.
@@ -966,6 +966,8 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment.mRemoteToken.toWindowContainerToken()) mTaskFragment.mRemoteToken.toWindowContainerToken())
.setErrorCallbackToken(mErrorToken); .setErrorCallbackToken(mErrorToken);
mWindowOrganizerController.applyTransaction(mTransaction); mWindowOrganizerController.applyTransaction(mTransaction);
// The pending event will be dispatched on the handler (from requestTraversal).
waitHandlerIdle(mWm.mAnimationHandler);
verify(mOrganizer).onTaskFragmentError(eq(mErrorToken), any(SecurityException.class)); verify(mOrganizer).onTaskFragmentError(eq(mErrorToken), any(SecurityException.class));
} }