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

Merge "Allow two SurfaceViews inbetween the app and the wallpaper."

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-09-10 14:36:21 -07:00
committed by Android Code Review
parent 7c65585feb 73dc2592be
commit 962e482606
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1501,6 +1501,7 @@ public class WindowManagerService extends IWindowManager.Stub
WindowState wb = (WindowState)localmWindows.get(foundI-1); WindowState wb = (WindowState)localmWindows.get(foundI-1);
if (wb.mBaseLayer < maxLayer && if (wb.mBaseLayer < maxLayer &&
wb.mAttachedWindow != foundW && wb.mAttachedWindow != foundW &&
wb.mAttachedWindow != foundW.mAttachedWindow &&
(wb.mAttrs.type != TYPE_APPLICATION_STARTING || (wb.mAttrs.type != TYPE_APPLICATION_STARTING ||
wb.mToken != foundW.mToken)) { wb.mToken != foundW.mToken)) {
// This window is not related to the previous one in any // This window is not related to the previous one in any