diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2009-10-29 13:45:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 13:45:05 -0700 |
| commit | 18eedbacac964f200309f99fdfca06a0a01e5bf5 (patch) | |
| tree | a893ad2ccecf48a5c14b072e5cec4761dac05506 | |
| parent | 0fca5b45ffe86c1c69359e6eb3727a9953b971c9 (diff) | |
| parent | a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0 (diff) | |
| download | frameworks_base-18eedbacac964f200309f99fdfca06a0a01e5bf5.zip frameworks_base-18eedbacac964f200309f99fdfca06a0a01e5bf5.tar.gz frameworks_base-18eedbacac964f200309f99fdfca06a0a01e5bf5.tar.bz2 | |
am a47a1e77: Merge change Ic03d28b9 into eclair
Merge commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0' into eclair-mr2
* commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0':
Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class WindowManagerService extends IWindowManager.Stub 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) { |