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

Commit 3aacbbc0 authored by Craig Mautner's avatar Craig Mautner Committed by Wale Ogunwale
Browse files

Add a timeout state to frozen windows 

When an activity stops drawing following a rotation the rotation
screenshot would become stuck on top of all the other windows. The
timeout was being acknowledged but mWindowsFreezingScreen was set to
true which kept stopFreezingDisplayLocked() from dismissing the
screen rotation animation.

By changing mWindowsFreezingScreen from a two state variable to a
three state variable, including a timeout state we allow
stopFreezingDisplayLocked() to continue and dismiss the screen
rotation animtion.

This change also reduces the APP_FREEZING_TIMOEOUT from 5 seconds to
2 seconds.

Bug: 15664090

Change-Id: Ida5aca002a82ec8fe1ea99f0ced814c5c8f01a95
parent 8928c727

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

+17 −9
Original line number Diff line number Diff line
@@ -504,7 +504,12 @@ public class WindowManagerService extends IWindowManager.Stub 
    int mLastDisplayFreezeDuration = 0;

    Object mLastFinishedFreezeSource = null;

    boolean mWaitingForConfig = false;

    boolean mWindowsFreezingScreen = false;



    final static int WINDOWS_FREEZING_SCREENS_NONE = 0;

    final static int WINDOWS_FREEZING_SCREENS_ACTIVE = 1;

    final static int WINDOWS_FREEZING_SCREENS_TIMEOUT = 2;

    private int mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_NONE;



    boolean mClientFreezingScreen = false;

    int mAppsFreezingScreen = 0;

    int mLastWindowForcedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
@@ -4761,7 +4766,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (mAppsFreezingScreen == 1) {

                    startFreezingDisplayLocked(false, 0, 0);

                    mH.removeMessages(H.APP_FREEZE_TIMEOUT);

                    mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 5000);

                    mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 2000);

                }

            }

            final int N = wtoken.allAppWindows.size();
@@ -6550,7 +6555,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        mAltOrientation = altOrientation;

        mPolicy.setRotationLw(mRotation);



        mWindowsFreezingScreen = true;

        mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_ACTIVE;

        mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);

        mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT, WINDOW_FREEZE_TIMEOUT_DURATION);

        mWaitingForConfig = true;
@@ -7920,6 +7925,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                    // TODO(multidisplay): Can non-default displays rotate?

                    synchronized (mWindowMap) {

                        Slog.w(TAG, "Window freeze timeout expired.");

                        mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_TIMEOUT;

                        final WindowList windows = getDefaultWindowListLocked();

                        int i = windows.size();

                        while (i > 0) {
@@ -7991,6 +7997,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                case APP_FREEZE_TIMEOUT: {

                    synchronized (mWindowMap) {

                        Slog.w(TAG, "App freeze timeout expired.");

                        mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_TIMEOUT;

                        final int numStacks = mStackIdToStack.size();

                        for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) {

                            final TaskStack stack = mStackIdToStack.valueAt(stackNdx);
@@ -9081,8 +9088,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            w.mOrientationChanging = true;

            w.mLastFreezeDuration = 0;

            mInnerFields.mOrientationChangeComplete = false;

            if (!mWindowsFreezingScreen) {

                mWindowsFreezingScreen = true;

            if (mWindowsFreezingScreen == WINDOWS_FREEZING_SCREENS_NONE) {

                mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_ACTIVE;

                // XXX should probably keep timeout from

                // when we first froze the display.

                mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
@@ -10107,8 +10114,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                "With display frozen, orientationChangeComplete="

                + mInnerFields.mOrientationChangeComplete);

        if (mInnerFields.mOrientationChangeComplete) {

            if (mWindowsFreezingScreen) {

                mWindowsFreezingScreen = false;

            if (mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_NONE) {

                mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_NONE;

                mLastFinishedFreezeSource = mInnerFields.mLastWindowFreezeSource;

                mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);

            }
@@ -10394,7 +10401,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        } else {

            mInnerFields.mOrientationChangeComplete = true;

            mInnerFields.mLastWindowFreezeSource = mAnimator.mLastWindowFreezeSource;

            if (mWindowsFreezingScreen) {

            if (mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_NONE) {

                doRequest = true;

            }

        }
@@ -10739,7 +10746,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            return;

        }



        if (mWaitingForConfig || mAppsFreezingScreen > 0 || mWindowsFreezingScreen

        if (mWaitingForConfig || mAppsFreezingScreen > 0

                || mWindowsFreezingScreen == WINDOWS_FREEZING_SCREENS_ACTIVE

                || mClientFreezingScreen || !mOpeningApps.isEmpty()) {

            if (DEBUG_ORIENTATION) Slog.d(TAG,

                "stopFreezingDisplayLocked: Returning mWaitingForConfig=" + mWaitingForConfig