Commit fa4eb085 authored Apr 30, 2013 by Romain Guy Committed by Android Git Automerger Apr 30, 2013

am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint...

am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev

* commit 'b107b7e9':
  Prevent TextureView from ever setting a null layer paint Bug #8760436

parents 6e629e84 b107b7e9

core/java/android/view/TextureView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ public class TextureView extends View {
		@Override
		public void setLayerType(int layerType, Paint paint) {
		if (paint != mLayerPaint) {
		mLayerPaint = paint;
		mLayerPaint = paint == null ? new Paint() : paint;
		invalidate();
		}
		}