From e78b8003a5870c0e80ed92c4df442871fb9d0b61 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Mon, 4 Mar 2013 19:08:02 -0800
Subject: [PATCH] Finish current Canvas operations then resume previous Canvas
 Bug #8297260

Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
---
 core/java/android/view/GLES20RenderLayer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/java/android/view/GLES20RenderLayer.java b/core/java/android/view/GLES20RenderLayer.java
index 086e78cb7d236..685dc7086e1e5 100644
--- 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