diff options
| author | Romain Guy <romainguy@google.com> | 2011-06-22 21:02:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-22 21:02:31 -0700 |
| commit | 8b4512ef203ee0bc3bca33224f1e03f2c1e59546 (patch) | |
| tree | 210ed6f7d5c996de1256444a8692ce7858398f63 /core | |
| parent | c2e0a1f1cdd249694bf707a7bc066e7808c340d0 (diff) | |
| parent | 1ec3a58bcdd0d5fa82cf878d974d062811933ae2 (diff) | |
| download | frameworks_base-8b4512ef203ee0bc3bca33224f1e03f2c1e59546.zip frameworks_base-8b4512ef203ee0bc3bca33224f1e03f2c1e59546.tar.gz frameworks_base-8b4512ef203ee0bc3bca33224f1e03f2c1e59546.tar.bz2 | |
Merge "Prevent possible NPE in TextureView"
Diffstat (limited to 'core')
| -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 51f6640..4790289 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -166,7 +166,7 @@ public class TextureView extends View { public void setOpaque(boolean opaque) { if (opaque != mOpaque) { mOpaque = opaque; - updateLayer(); + if (mLayer != null) updateLayer(); } } |