Merge changes Ic3affb60,If09a6623

* changes:
  Fix NopCanvas initialization
  NopCanvas is only hw accelerated during construction

1 files changed, 6 insertions, 2 deletions

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/graphics/NopCanvas.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/graphics/NopCanvas.java
index 2b4661b08210..131aa1752ba0 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/graphics/NopCanvas.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/graphics/NopCanvas.java
@@ -31,14 +31,18 @@ import android.graphics.RectF;
  * Canvas implementation that does not do any rendering
  */
 public class NopCanvas extends Canvas {
+    private boolean mIsInitialized = false;
+
     public NopCanvas() {
         super();
+        mIsInitialized = true;
     }
 
     @Override
     public boolean isHardwareAccelerated() {
-        // Return true so there is no allocations for the software renderer in the constructor
-        return true;
+        // We return true the first time so there are no allocations for the software renderer in
+        // the constructor
+        return !mIsInitialized;
     }
 
     @Override