Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev

2013-03-05 03:11:10 +00:00
parent 188f8c5e4b e78b8003a5
commit d23b2747ef
1 changed files with 3 additions and 3 deletions
--- a/core/java/android/view/GLES20RenderLayer.java
+++ b/core/java/android/view/GLES20RenderLayer.java
@@ -89,13 +89,13 @@ class GLES20RenderLayer extends GLES20Layer {

    @Override
    void end(Canvas currentCanvas) {
-        if (currentCanvas instanceof GLES20Canvas) {
-            ((GLES20Canvas) currentCanvas).resume();
-        }
        HardwareCanvas canvas = getCanvas();
        if (canvas != null) {
            canvas.onPostDraw();
        }
+        if (currentCanvas instanceof GLES20Canvas) {
+            ((GLES20Canvas) currentCanvas).resume();
+        }
    }

    @Override