From 10e5e4547e98906311ba95b8e4cd4330170ab33d Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Thu, 3 Jun 2021 17:39:05 -0400
Subject: [PATCH] Return colors of areas even if they are not in current page

Bug: b/189827568
Test: manual
Change-Id: I917c7b8e61cd18d04075600f4337806deb7f41bf
---
 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 324d1abf24bbb..8cfed288e6664 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -1719,6 +1719,7 @@ public abstract class WallpaperService extends Service {
                 float finalStep = step;
                 int finalPageIndx = pageIndx;
                 Bitmap screenShot = page.getBitmap();
+                if (screenShot == null) screenShot = mLastScreenshot;
                 if (screenShot == null || screenShot.isRecycled()) {
                     if (DEBUG) {
                         Log.d(TAG, "invalid bitmap " + screenShot