Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03821dc6 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

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

* commit '962e4826':
  Allow two SurfaceViews inbetween the app and the wallpaper.
parents d77b0dfd 962e4826

services/java/com/android/server/WindowManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -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