am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper."

Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp

* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
  Allow two SurfaceViews inbetween the app and the wallpaper.
This commit is contained in:
Jean-Baptiste Queru
2010-09-10 15:47:34 -07:00
committed by Android Git Automerger

View File

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