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

am 18eedbac: am a47a1e77: Merge change Ic03d28b9 into eclair

Browse Source 
Merge commit '18eedbacac964f200309f99fdfca06a0a01e5bf5' into eclair-mr2-plus-aosp

* commit '18eedbacac964f200309f99fdfca06a0a01e5bf5':
  Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
This commit is contained in:
Suchi Amalapurapu
2009-10-29 14:02:18 -07:00
committed by Android Git Automerger
parent 29f043d742 18eedbacac
commit f545e798eb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9644,7 +9644,8 @@ public class WindowManagerService extends IWindowManager.Stub
WindowState w = (WindowState)mWindows.get(i); WindowState w = (WindowState)mWindows.get(i);
if (w.mSurface != null) { if (w.mSurface != null) {
final WindowManager.LayoutParams attrs = w.mAttrs; 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; forceHiding = true;
} else if (mPolicy.canBeForceHidden(w, attrs)) { } else if (mPolicy.canBeForceHidden(w, attrs)) {
if (!w.mAnimating) { if (!w.mAnimating) {