am f545e798: am 18eedbac: am a47a1e77: Merge change Ic03d28b9 into eclair
Merge commit 'f545e798ebbe7e081c8e87ad32aa450388364bef'
* commit 'f545e798ebbe7e081c8e87ad32aa450388364bef':
Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index cd6a371..0f2367d 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -9644,7 +9644,8 @@
WindowState w = (WindowState)mWindows.get(i);
if (w.mSurface != null) {
final WindowManager.LayoutParams attrs = w.mAttrs;
- if (mPolicy.doesForceHide(w, attrs)) {
+ if (mPolicy.doesForceHide(w, attrs) && w.isVisibleLw()) {
+ if (DEBUG_FOCUS) Log.i(TAG, "win=" + w + " force hides other windows");
forceHiding = true;
} else if (mPolicy.canBeForceHidden(w, attrs)) {
if (!w.mAnimating) {