commit e78b8003a5870c0e80ed92c4df442871fb9d0b61
author Romain Guy <romainguy@google.com> Mon Mar 04 19:08:02 2013 -0800
committer Romain Guy <romainguy@google.com> Mon Mar 04 19:08:02 2013 -0800
tree 76062f2ceb113c25c4f4b1e1d3a5555accd425bd
parent fe28ef84f253190faaecf6fa3848898e41212ddb

Finish current Canvas operations then resume previous Canvas
Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb

core/java/android/view/GLES20RenderLayer.java

diff --git a/core/java/android/view/GLES20RenderLayer.java b/core/java/android/view/GLES20RenderLayer.java
index 086e78c..685dc70 100644
--- a/core/java/android/view/GLES20RenderLayer.java
+++ b/core/java/android/view/GLES20RenderLayer.java
@@ -89,13 +89,13 @@
 
     @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