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

Commit ea0251c7 authored by Jon Miranda's avatar Jon Miranda
Browse files

Check if getSurfaceControl is valid before passing it into SurfaceControl#mirrorSurface 

Fixes: 431718969
Test: manual
Flag: EXEMPT bugfix
Change-Id: Iee85a74c9d908418f23394de660def531afa5017
parent e60d1401

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;

    }