commit 3dc3abe28da7022da719c2516299a549a8b06f2b
author Jay Aliomer <aaliomer@google.com> Mon Jun 07 19:49:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 07 19:49:31 2021 +0000
tree 4e889ba1ab51a8c9806698d659b5e174338f2e72
parent 02ce2626f44ea13bf593e969855ab190c73bd6fc
parent 1e70989c61e1e06c1de508cb8262299dd349ebd8

Merge "Return colors of areas even if they are not in current page" into sc-dev am: 1e70989c61

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14827878

Change-Id: Ibbb770265f385a4c47874b67cb93f8e9b887006e

core/java/android/service/wallpaper/WallpaperService.java

diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 085136e..941e9aa 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -1764,6 +1764,7 @@
                 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