am 9b52a218: Fix #2269582 Sometimes camera preview screen is truncated

Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-mr2

* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
  Fix #2269582 Sometimes camera preview screen is truncated

diff --cc services/java/com/android/server/WindowManagerService.java
index ea0b778,3180a17..d250e3c
--- 1/services/java/com/android/server/WindowManagerService.java
--- 2/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@@ -5077,13 -5081,15 +5079,15 @@@ public class WindowManagerService exten
                          mKeyWaiter.mOutsideTouchTargets = null;
                      }
                  }
 -                
 +
                  // If we are on top of the wallpaper, then the wallpaper also
                  // gets to see this movement.
-                 if (mWallpaperTarget == target || mSendingPointersToWallpaper) {
+                 if ((mWallpaperTarget == target &&
+                         target.mAttrs.type != WindowManager.LayoutParams.TYPE_KEYGUARD)
+                         || mSendingPointersToWallpaper) {
                      sendPointerToWallpaperLocked(null, ev, eventTime);
                  }
 -                
 +
                  final Rect frame = target.mFrame;
                  ev.offsetLocation(-(float)frame.left, -(float)frame.top);
                  mKeyWaiter.bindTargetWindowLocked(target);