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

Commit e808c04d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 668ac753 to master"

parents 59202a3e 11c26c22

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

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { 
    private boolean mSustainedPerformanceModeCurrent = false;



    boolean mWallpaperMayChange = false;

    // During an orientation change, we track whether all windows have rendered

    // at the new orientation, and this will be false from changing orientation until that occurs.

    // For seamless rotation cases this always stays true, as the windows complete their orientation

    // changes 1 by 1 without disturbing global state.

    boolean mOrientationChangeComplete = true;

    boolean mWallpaperActionPending = false;

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

+5 −1
Original line number Diff line number Diff line
@@ -3005,7 +3005,11 @@ public class WindowManagerService extends IWindowManager.Stub 
        Configuration config = null;



        if (updateOrientationFromAppTokensLocked(false)) {

            if (freezeThisOneIfNeeded != null) {

            // If we changed the orientation but mOrientationChangeComplete is

            // already true, we used seamless rotation, and we don't need

            // to freeze the screen.

            if (freezeThisOneIfNeeded != null &&

                    !mRoot.mOrientationChangeComplete) {

                final AppWindowToken atoken = findAppWindowToken(freezeThisOneIfNeeded);

                if (atoken != null) {

                    atoken.startFreezingScreen();