Merge change Ifd95b9f5 into eclair

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

1 files changed, 3 insertions, 1 deletions

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 44c9f0f7544b..cd74522f339a 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -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());
                         }
                     }