Merge "Fix NPE while using mLayerPaint" into nyc-dev (4edfdd55) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -16855,11 +16855,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		} else {
		// use layer paint to draw the bitmap, merging the two alphas, but also restore
		int layerPaintAlpha = mLayerPaint != null ? mLayerPaint.getAlpha() : 255;
		if (mLayerPaint == null && alpha < 1) {
		mLayerPaint = new Paint();
		mLayerPaint.setAlpha((int) (alpha * layerPaintAlpha));
		}
		canvas.drawBitmap(cache, 0.0f, 0.0f, mLayerPaint);
		if (mLayerPaint != null) {
		mLayerPaint.setAlpha(layerPaintAlpha);
		}
		}
		}

		if (restoreTo >= 0) {
		canvas.restoreToCount(restoreTo);