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

Commit 01f2d1ac authored by Adrian Roos's avatar Adrian Roos
Browse files

Fix premature clearing of clearable sysui flags 

Fixes a bug where all clearable flags would be cleared even if
only a subset actually changes; new behavior is clearing only
the flags that actually got cleared.

Bug: 22331526
Change-Id: Icbb12121c977e48457692c054571521c6f6eb730
parent 76d2fe42

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

+8 −6
Original line number Original line Diff line number Diff line
@@ -10978,6 +10978,13 @@ public class WindowManagerService extends IWindowManager.Stub 
        if (mLastDispatchedSystemUiVisibility == visibility) {

        if (mLastDispatchedSystemUiVisibility == visibility) {

            return;

            return;

        }

        }

        final int globalDiff = (visibility ^ mLastDispatchedSystemUiVisibility)

                // We are only interested in differences of one of the

                // clearable flags...

                & View.SYSTEM_UI_CLEARABLE_FLAGS

                // ...if it has actually been cleared.

                & ~visibility;



        mLastDispatchedSystemUiVisibility = visibility;

        mLastDispatchedSystemUiVisibility = visibility;

        mInputManager.setSystemUiVisibility(visibility);

        mInputManager.setSystemUiVisibility(visibility);

        final WindowList windows = getDefaultWindowListLocked();

        final WindowList windows = getDefaultWindowListLocked();
@@ -10986,12 +10993,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            WindowState ws = windows.get(i);

            WindowState ws = windows.get(i);

            try {

            try {

                int curValue = ws.mSystemUiVisibility;

                int curValue = ws.mSystemUiVisibility;

                int diff = curValue ^ visibility;

                int diff = (curValue ^ visibility) & globalDiff;

                // We are only interested in differences of one of the

                // clearable flags...

                diff &= View.SYSTEM_UI_CLEARABLE_FLAGS;

                // ...if it has actually been cleared.

                diff &= ~visibility;

                int newValue = (curValue&~diff) | (visibility&diff);

                int newValue = (curValue&~diff) | (visibility&diff);

                if (newValue != curValue) {

                if (newValue != curValue) {

                    ws.mSeq++;

                    ws.mSeq++;