Merge "Safely dispose of the resize buffer"

2013-06-21 21:08:26 +00:00
parent 4f20f8ae50 27e0bf6278
commit 4a7052a775
1 changed files with 9 additions and 5 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -923,9 +923,14 @@ public final class ViewRootImpl implements ViewParent,
    }

    void disposeResizeBuffer() {
-        if (mResizeBuffer != null) {
-            mResizeBuffer.destroy();
-            mResizeBuffer = null;
+        if (mResizeBuffer != null && mAttachInfo.mHardwareRenderer != null) {
+            mAttachInfo.mHardwareRenderer.safelyRun(new Runnable() {
+                @Override
+                public void run() {
+                    mResizeBuffer.destroy();
+                    mResizeBuffer = null;
+                }
+            });
        }
    }

@@ -1466,8 +1471,7 @@ public final class ViewRootImpl implements ViewParent,
                            if (mResizeBuffer != null) {
                                mResizeBuffer.end(hwRendererCanvas);
                                if (!completed) {
-                                    mResizeBuffer.destroy();
-                                    mResizeBuffer = null;
+                                    disposeResizeBuffer();
                                }
                            }
                        }