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

Commit 1dcdde6c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "NullPointerException when retriving wallpaper page areas" into sc-dev am: 6a72ef35 

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

Change-Id: Icb7278382f050411c1eedfd9e2fe5f0c544f253e
parents aef0e837 6a72ef35

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

+2 −0
Original line number Diff line number Diff line
@@ -1570,6 +1570,7 @@ public abstract class WallpaperService extends Service { 
                        + page.getBitmap().getWidth() + " x " + page.getBitmap().getHeight());

            }

            for (RectF area: page.getAreas()) {

                if (area == null) continue;

                RectF subArea = generateSubRect(area, pageIndx, numPages);

                Bitmap b = page.getBitmap();

                int x = Math.round(b.getWidth() * subArea.left);
@@ -1933,6 +1934,7 @@ public abstract class WallpaperService extends Service { 
    }



    private boolean isValid(RectF area) {

        if (area == null) return false;

        boolean valid = area.bottom > area.top && area.left < area.right

                && LOCAL_COLOR_BOUNDS.contains(area);

        return valid;