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

Commit f88b162d authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 67ed39bb: am 90192a61: am 0495f4ed: Merge "Make SurfaceView layers captured... 

am 67ed39bb: am 90192a61: am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"

* commit '67ed39bb':
  Make SurfaceView layers captured by screenshotApplications()
parents ec9830e7 67ed39bb

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

+1 −7
Original line number Diff line number Diff line
@@ -5582,8 +5582,7 @@ public class WindowManagerService extends IWindowManager.Stub 


                    // We keep on including windows until we go past a full-screen

                    // window.

                    boolean fullscreen = ws.isFullscreen(dw, dh);

                    including = !ws.mIsImWindow && !fullscreen;

                    including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh);



                    final WindowStateAnimator winAnim = ws.mWinAnimator;

                    if (maxLayer < winAnim.mSurfaceLayer) {
@@ -5609,11 +5608,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                            ws.isDisplayedLw()) {

                        screenshotReady = true;

                    }



                    if (fullscreen) {

                        // No point in continuing down through windows.

                        break;

                    }

                }



                if (appToken != null && appWin == null) {