From ad09fa8babe0be2415497b570664b0e47151b870 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Tue, 18 Jan 2022 13:05:38 -0500
Subject: [PATCH] check surface valid before screenshotting wallapper

Fixes: 214410335
Test: manual`
Change-Id: Ief56edec17a3540d8747694bc77764e2ab55c24f
---
 core/java/android/service/wallpaper/WallpaperService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 73ffd66486d25..32437ceed77f1 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -1587,6 +1587,7 @@ public abstract class WallpaperService extends Service {
                 return;
             }
             Surface surface = mSurfaceHolder.getSurface();
+            if (!surface.isValid()) return;
             boolean widthIsLarger = mSurfaceSize.x > mSurfaceSize.y;
             int smaller = widthIsLarger ? mSurfaceSize.x
                     : mSurfaceSize.y;