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

Merge "Disallow too large display padding for wallpaper" into sc-v2-dev am: 360e11ff90

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

Change-Id: I8831a8b38c8341334860b9cabd02928bce1d0e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-06 17:17:43 +00:00
committed by Automerger Merge Worker
parent b6ac4a054b 360e11ff90
commit 8ce2b18f39
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2267,6 +2267,19 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
throw new IllegalArgumentException("padding must be positive: " + padding); throw new IllegalArgumentException("padding must be positive: " + padding);
} }
int maxSize = getMaximumSizeDimension(displayId);
final int paddingWidth = padding.left + padding.right;
final int paddingHeight = padding.top + padding.bottom;
if (paddingWidth > maxSize) {
throw new IllegalArgumentException("padding width " + paddingWidth
+ " exceeds max width " + maxSize);
}
if (paddingHeight > maxSize) {
throw new IllegalArgumentException("padding height " + paddingHeight
+ " exceeds max height " + maxSize);
}
final DisplayData wpdData = getDisplayDataOrCreate(displayId); final DisplayData wpdData = getDisplayDataOrCreate(displayId);
if (!padding.equals(wpdData.mPadding)) { if (!padding.equals(wpdData.mPadding)) {
wpdData.mPadding.set(padding); wpdData.mPadding.set(padding);