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

Commit 10454e2b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check if getSurfaceControl is valid before passing it into... 

Merge "Check if getSurfaceControl is valid before passing it into SurfaceControl#mirrorSurface" into main
parents 5326234f ea0251c7

services/core/java/com/android/server/wm/WallpaperController.java

+5 −2
Original line number Diff line number Diff line
@@ -993,8 +993,11 @@ class WallpaperController { 
     */

    SurfaceControl mirrorWallpaperSurface() {

        final WindowState wallpaperWindowState = getTopVisibleWallpaper();

        return wallpaperWindowState != null

                ? SurfaceControl.mirrorSurface(wallpaperWindowState.mToken.getSurfaceControl())

        final SurfaceControl wallpaperSurfaceControl = wallpaperWindowState != null

            ? wallpaperWindowState.mToken.getSurfaceControl()

            : null;

        return wallpaperSurfaceControl != null

                ? SurfaceControl.mirrorSurface(wallpaperSurfaceControl)

                : null;

    }