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

Merge "Add null checks in wallpaper service" into sc-dev

Browse Source
This commit is contained in:
Jay Aliomer
2021-03-30 19:45:55 +00:00
committed by Android (Google) Code Review
parent 6c9640f8b3 32e5de029d
commit 3bff4d5edc
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -761,11 +761,18 @@ public abstract class WallpaperService extends Service {
public void notifyLocalColorsChanged(@NonNull List<RectF> regions,
@NonNull List<WallpaperColors> colors)
throws RuntimeException {
for (int i = 0; i < regions.size() && i < colors.size() && colors.get(i) != null; i++) {
for (int i = 0; i < regions.size() && i < colors.size(); i++) {
WallpaperColors color = colors.get(i);
RectF area = regions.get(i);
if (color == null || area == null) {
Log.wtf(TAG, "notifyLocalColorsChanged null values. color: "
+ color + " area " + area);
continue;
}
try {
mConnection.onLocalWallpaperColorsChanged(
regions.get(i),
colors.get(i),
area,
color,
mDisplayContext.getDisplayId()
);
} catch (RemoteException e) {
@@ -1355,7 +1362,8 @@ public abstract class WallpaperService extends Service {
+ xOffsetStep);
}
//below is the default implementation
if (xOffset % xOffsetStep > MIN_PAGE_ALLOWED_MARGIN) return;
if (xOffset % xOffsetStep > MIN_PAGE_ALLOWED_MARGIN
|| !mSurfaceHolder.getSurface().isValid()) return;
int xPage;
int xPages;
if (!validStep(xOffsetStep)) {
@@ -1671,6 +1679,10 @@ public abstract class WallpaperService extends Service {
}
for (int i = 0; i < areas.size(); i++) {
RectF currentArea = areas.get(i);
if (currentArea == null || !isValid(currentArea)) {
Log.wtf(TAG, "invalid local area " + currentArea);
continue;
}
EngineWindowPage page;
RectF area;
int pageIndx;

10
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -2389,13 +2389,15 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
private IWallpaperEngine getEngine(int which, int userId, int displayId) {
WallpaperData wallpaperData = findWallpaperAtDisplay(userId, displayId);
if (wallpaperData == null) return null;
WallpaperConnection connection = wallpaperData.connection;
if (connection == null) return null;
IWallpaperEngine engine = null;
synchronized (mLock) {
for (int i = 0; i < wallpaperData.connection.mDisplayConnector.size(); i++) {
int id = wallpaperData.connection.mDisplayConnector.get(i).mDisplayId;
int currentWhich = wallpaperData.connection.mDisplayConnector.get(i).mDisplayId;
for (int i = 0; i < connection.mDisplayConnector.size(); i++) {
int id = connection.mDisplayConnector.get(i).mDisplayId;
int currentWhich = connection.mDisplayConnector.get(i).mDisplayId;
if (id != displayId && currentWhich != which) continue;
engine = wallpaperData.connection.mDisplayConnector.get(i).mEngine;
engine = connection.mDisplayConnector.get(i).mEngine;
break;
}
}