From bc32a51cebec4cb6521989af3fc4e275f23c88e9 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Fri, 25 Jun 2021 13:48:37 -0400
Subject: [PATCH] NullPointerException when retriving wallpaper page areas

Fixes: 191293701
Test: manual
Change-Id: I18c4d627f29848b50bb8c7dc2b4a02627ff3a89b
---
 core/java/android/service/wallpaper/WallpaperService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 05ed75a7d8fb1..a88d5b9d41223 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -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;