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

Commit c3f29da9 authored by Louis Chang's avatar Louis Chang
Browse files

Do not report resized before sending new configuration 

When display size changed, we reported to client that its windows
should be resized (but with old configuration). The new configuration
was then updated later. Since the IWindow#resized is a one way
binder call, there is no guarantee that client has completed
scheduling window-resized messages before the new configuration
updating request. So, test case was flaky while running on CF, which
had failed if the client updated to new configuration prior to handle
window resized.

Bug: 121105810
Test: atest ActivityManagerMultiDisplayTests

Change-Id: Ic661bc36494d268a2e712a079ba26baf47626130
parent 25e0861b

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -793,8 +793,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
    private void handleResizingWindows() {

    private void handleResizingWindows() {

        for (int i = mWmService.mResizingWindows.size() - 1; i >= 0; i--) {

        for (int i = mWmService.mResizingWindows.size() - 1; i >= 0; i--) {

            WindowState win = mWmService.mResizingWindows.get(i);

            WindowState win = mWmService.mResizingWindows.get(i);

            if (win.mAppFreezing) {

            if (win.mAppFreezing || win.getDisplayContent().mWaitingForConfig) {

                // Don't remove this window until rotation has completed.

                // Don't remove this window until rotation has completed and is not waiting for the

                // complete configuration.

                continue;

                continue;

            }

            }

            win.reportResized();

            win.reportResized();