Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev
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