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

Commit 9e092d83 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

Merge "Do not add layout reason if there is no config effect" into tm-qpr-dev am: 5eb759d2 am: d3b797f5

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



Change-Id: Ic223bed08d4ee2d8c16b86cb84b82306480d5d17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 925e3670 d3b797f5

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

+2 −0
Original line number Diff line number Diff line
@@ -470,6 +470,8 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr 
                .setException(exception)

                .build();

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

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }

        } finally {

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

+4 −2
Original line number Diff line number Diff line
@@ -922,13 +922,14 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 
                .build();

        doReturn(true).when(mTaskFragment).isAllowedToEmbedActivity(activity);

        mWindowOrganizerController.mLaunchTaskFragments.put(mFragmentToken, mTaskFragment);

        clearInvocations(mAtm.mRootWindowContainer);



        // Reparent activity to mTaskFragment, which is smaller than activity's

        // minimum dimensions.

        mTransaction.reparentActivityToTaskFragment(mFragmentToken, activity.token)

                .setErrorCallbackToken(mErrorToken);

        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));

    }
@@ -958,7 +959,6 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 
        doReturn(true).when(mTaskFragment).isAllowedToEmbedActivity(activity);

        mWindowOrganizerController.mLaunchTaskFragments.put(oldFragToken, oldTaskFrag);

        mWindowOrganizerController.mLaunchTaskFragments.put(mFragmentToken, mTaskFragment);

        clearInvocations(mAtm.mRootWindowContainer);



        // Reparent oldTaskFrag's children to mTaskFragment, which is smaller than activity's

        // minimum dimensions.
@@ -966,6 +966,8 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase { 
                        mTaskFragment.mRemoteToken.toWindowContainerToken())

                .setErrorCallbackToken(mErrorToken);

        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));

    }