Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NullPointerException when retriving wallpaper page areas" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-25 19:45:24 +00:00
committed by Android (Google) Code Review
parent 270922b370 bc32a51ceb
commit 6a72ef35a7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -1570,6 +1570,7 @@ public abstract class WallpaperService extends Service {
+ page.getBitmap().getWidth() + " x " + page.getBitmap().getHeight()); + page.getBitmap().getWidth() + " x " + page.getBitmap().getHeight());
} }
for (RectF area: page.getAreas()) { for (RectF area: page.getAreas()) {
if (area == null) continue;
RectF subArea = generateSubRect(area, pageIndx, numPages); RectF subArea = generateSubRect(area, pageIndx, numPages);
Bitmap b = page.getBitmap(); Bitmap b = page.getBitmap();
int x = Math.round(b.getWidth() * subArea.left); int x = Math.round(b.getWidth() * subArea.left);
@@ -1933,6 +1934,7 @@ public abstract class WallpaperService extends Service {
} }
private boolean isValid(RectF area) { private boolean isValid(RectF area) {
if (area == null) return false;
boolean valid = area.bottom > area.top && area.left < area.right boolean valid = area.bottom > area.top && area.left < area.right
&& LOCAL_COLOR_BOUNDS.contains(area); && LOCAL_COLOR_BOUNDS.contains(area);
return valid; return valid;