diff options
| author | Romain Guy <romainguy@google.com> | 2013-05-01 01:14:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-01 01:14:41 +0000 |
| commit | b107b7e9ecaee799a7a18b8ab897969ef554fd9b (patch) | |
| tree | c6f59ee98eb214fe34842a5ef8a36fe25d831245 /core/java/android | |
| parent | 95a9bfe2ba75d79fff8157ed57e75c4ffb5a08ac (diff) | |
| parent | efb709adfe61ec71dec26127b8a2a7d8ceacc767 (diff) | |
Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/TextureView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index 230f426626a0..5c3934d82077 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -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(); } } |