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

Commit 854fadca authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by Android (Google) Code Review
Browse files

Merge "Fix wallpaper input consumer handling in InputMonitor"

parents a7694472 f174ca93

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

+4 −3
Original line number Diff line number Diff line
@@ -306,8 +306,9 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
                }



                if (addWallpaperInputConsumerHandle) {

                    if (child.mAttrs.type == WindowManager.LayoutParams.TYPE_WALLPAPER) {

                        // Add the wallpaper input consumer above the first wallpaper window.

                    if (child.mAttrs.type == WindowManager.LayoutParams.TYPE_WALLPAPER &&

                            child.isVisibleLw()) {

                        // Add the wallpaper input consumer above the first visible wallpaper.

                        addInputWindowHandleLw(mService.mWallpaperInputConsumer.mWindowHandle);

                        addWallpaperInputConsumerHandle = false;

                    }
@@ -341,7 +342,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
        }



        if (addWallpaperInputConsumerHandle) {

            // No wallpaper found, add the wallpaper input consumer at the end.

            // No visible wallpaper found, add the wallpaper input consumer at the end.

            addInputWindowHandleLw(mService.mWallpaperInputConsumer.mWindowHandle);

        }