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

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

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

Merge commit '03821dc6'

* commit '03821dc6':
  Allow two SurfaceViews inbetween the app and the wallpaper.
parents 8485fedf 03821dc6

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

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