Merge "Ensure wallpaper hint is at least the display's max size." into klp-dev (a89727c8) · Commits · e / os / android_frameworks_base

services/java/com/android/server/WallpaperManagerService.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -648,6 +648,10 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
		if (width <= 0 \|\| height <= 0) {
		throw new IllegalArgumentException("width and height must be > 0");
		}
		// Make sure it is at least as large as the display's maximum size.
		int maxSizeDimension = getMaximumSizeDimension();
		width = Math.max(width, maxSizeDimension);
		height = Math.max(height, maxSizeDimension);

		if (width != wallpaper.width \|\| height != wallpaper.height) {
		wallpaper.width = width;
		@@ -1146,9 +1150,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
		}

		// We always want to have some reasonable width hint.
		WindowManager wm = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
		Display d = wm.getDefaultDisplay();
		int baseSize = d.getMaximumSizeDimension();
		int baseSize = getMaximumSizeDimension();
		if (wallpaper.width < baseSize) {
		wallpaper.width = baseSize;
		}
		@@ -1157,6 +1159,12 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
		}
		}

		private int getMaximumSizeDimension() {
		WindowManager wm = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
		Display d = wm.getDefaultDisplay();
		return d.getMaximumSizeDimension();
		}

		// Called by SystemBackupAgent after files are restored to disk.
		void settingsRestored() {
		// TODO: If necessary, make it work for secondary users as well. This currently assumes