Merge "DO NOT MERGE Prevent ImageWallpaper from crashing due to wide gamut" into qt-dev (04ee91a8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/glwallpaper/ImageGLWallpaper.java

+15 −11

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ class ImageGLWallpaper {
		private void setupTexture(Bitmap bitmap) {
		final int[] tids = new int[1];

		if (bitmap == null) {
		if (bitmap == null \|\| bitmap.isRecycled()) {
		Log.w(TAG, "setupTexture: invalid bitmap");
		return;
		}
		@@ -179,16 +179,20 @@ class ImageGLWallpaper {
		return;
		}

		try {
		// Bind a named texture to a target.
		glBindTexture(GL_TEXTURE_2D, tids[0]);
		// Load the bitmap data and copy it over into the texture object that is currently bound.
		// Load the bitmap data and copy it over into the texture object
		// that is currently bound.
		GLUtils.texImage2D(GL_TEXTURE_2D, 0, bitmap, 0);
		// Use bilinear texture filtering when minification.
		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
		// Use bilinear texture filtering when magnification.
		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

		mTextureId = tids[0];
		} catch (IllegalArgumentException e) {
		Log.w(TAG, "Failed uploading texture: " + e.getLocalizedMessage());
		}
		}

		void useTexture() {

+9 −2

Original line number	Diff line number	Diff line
		@@ -86,7 +86,13 @@ class ImageProcessHelper {
		protected Float doInBackground(Bitmap... bitmaps) {
		Bitmap bitmap = bitmaps[0];
		if (bitmap != null) {
		try {
		return new Threshold().compute(bitmap);
		} catch (RuntimeException e) {
		Log.e(TAG, "Failed at computing threshold, color space="
		+ bitmap.getColorSpace(), e);
		return DEFAULT_THRESHOLD;
		}
		}
		Log.e(TAG, "ThresholdComputeTask: Can't get bitmap");
		return DEFAULT_THRESHOLD;
		@@ -116,7 +122,8 @@ class ImageProcessHelper {
		int width = bitmap.getWidth();
		int height = bitmap.getHeight();

		Bitmap grayscale = Bitmap.createBitmap(width, height, bitmap.getConfig());
		Bitmap grayscale = Bitmap.createBitmap(width, height,
		bitmap.getConfig(), false, bitmap.getColorSpace());
		Canvas canvas = new Canvas(grayscale);
		ColorMatrix cm = new ColorMatrix(LUMINOSITY_MATRIX);
		Paint paint = new Paint();