resolved conflicts for merge of b3ce4b1b to master (e4ca3050) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperManager.java

+29 −0

Original line number	Diff line number	Diff line
		@@ -911,6 +911,35 @@ public class WallpaperManager {
		*/
		public void suggestDesiredDimensions(int minimumWidth, int minimumHeight) {
		try {
		/**
		* The framework makes no attempt to limit the window size
		* to the maximum texture size. Any window larger than this
		* cannot be composited.
		*
		* Read maximum texture size from system property and scale down
		* minimumWidth and minimumHeight accordingly.
		*/
		int maximumTextureSize;
		try {
		maximumTextureSize = SystemProperties.getInt("sys.max_texture_size", 0);
		} catch (Exception e) {
		maximumTextureSize = 0;
		}

		if (maximumTextureSize > 0) {
		if ((minimumWidth > maximumTextureSize) \|\|
		(minimumHeight > maximumTextureSize)) {
		float aspect = (float)minimumHeight / (float)minimumWidth;
		if (minimumWidth > minimumHeight) {
		minimumWidth = maximumTextureSize;
		minimumHeight = (int)((minimumWidth * aspect) + 0.5);
		} else {
		minimumHeight = maximumTextureSize;
		minimumWidth = (int)((minimumHeight / aspect) + 0.5);
		}
		}
		}

		if (sGlobals.mService == null) {
		Log.w(TAG, "WallpaperService not running");
		} else {