Merge "Don't update TextureView's surface if the Layer doesn't exist"

Romain Guy · Android (Google) Code Review · commit 41ffd86df137 · 2012-04-12T16:58:47.000-07:00
diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java
@@ -187,7 +187,9 @@ public boolean isOpaque() {
     public void setOpaque(boolean opaque) {
         if (opaque != mOpaque) {
             mOpaque = opaque;
-            updateLayer();
+            if (mLayer != null) {
+                updateLayer();
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,9 @@ public boolean isOpaque() {`
`187`	`187`	`public void setOpaque(boolean opaque) {`
`188`	`188`	`if (opaque != mOpaque) {`
`189`	`189`	`mOpaque = opaque;`
`190`		`- updateLayer();`
	`190`	`+ if (mLayer != null) {`
	`191`	`+ updateLayer();`
	`192`	`+ }`
`191`	`193`	`}`
`192`	`194`	`}`
`193`	`195`