Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e851cdc6: Merge change Ifd95b9f5 into eclair

Browse Source 
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-mr2

* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
This commit is contained in:
Dianne Hackborn
2009-12-08 18:44:03 -08:00
committed by Android Git Automerger
parent 114800653c e851cdc6c4
commit 4c8454d869
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/WindowManagerService.java
View File

@@ -6012,7 +6012,9 @@ public class WindowManagerService extends IWindowManager.Stub
if (res != null && returnWhat == RETURN_PENDING_POINTER) { if (res != null && returnWhat == RETURN_PENDING_POINTER) {
synchronized (mWindowMap) { synchronized (mWindowMap) {
if (mWallpaperTarget == win || mSendingPointersToWallpaper) { if ((mWallpaperTarget == win &&
win.mAttrs.type != WindowManager.LayoutParams.TYPE_KEYGUARD)
|| mSendingPointersToWallpaper) {
sendPointerToWallpaperLocked(win, res, res.getEventTime()); sendPointerToWallpaperLocked(win, res, res.getEventTime());
} }
} }