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

Commit 00c1fc97 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen. 

This is a quick and dirty hack to not deliver touch events to the wallpaper when
they are being sent to the keyguard.  Perhaps we should have a separate window
flag for this, but...  bleah.  Maybe later.  Or maybe I'll use that secure flag.
Or something.

Change-Id: Ifd95b9f5b10db24a0854a93b925a833b24331b4c
parent d59fb6e7

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

+3 −1
Original line number Diff line number Diff line
@@ -6014,7 +6014,9 @@ public class WindowManagerService extends IWindowManager.Stub 
                

                if (res != null && returnWhat == RETURN_PENDING_POINTER) {

                    synchronized (mWindowMap) {

                        if (mWallpaperTarget == win || mSendingPointersToWallpaper) {

                        if ((mWallpaperTarget == win &&

                                win.mAttrs.type != WindowManager.LayoutParams.TYPE_KEYGUARD)

                                || mSendingPointersToWallpaper) {

                            sendPointerToWallpaperLocked(win, res, res.getEventTime());

                        }

                    }