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

Commit 69e7742a authored by Jay Aliomer's avatar Jay Aliomer Committed by Automerger Merge Worker
Browse files

Merge "Return colors of areas even if they are not in current page" into... 

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

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

Change-Id: Ie6462127b23fb9418f535b5364b36d3ad3de2c4e
parents 9634b41c 6da5b20f

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

+1 −0
Original line number Diff line number Diff line
@@ -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