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

Commit 4c8454d8 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am e851cdc6: Merge change Ifd95b9f5 into eclair 

Merge commit 'e851cdc6' into eclair-mr2

* commit 'e851cdc6':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
parents 11480065 e851cdc6

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

+3 −1
Original line number Diff line number Diff line
@@ -6012,7 +6012,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());

                        }

                    }