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

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

Change-Id: Ic9a15ad77ccb7003b9605457d61d0665eae6f812

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

@@ -1764,6 +1764,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