Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd23b2747eff9ae3203f96039794068e9f1b0c71b':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
This commit is contained in:
Romain Guy
2013-03-05 03:14:14 +00:00
committed by Android Git Automerger
parent e94fcd6c49 d23b2747ef
commit 370929f4bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/GLES20RenderLayer.java
View File

@@ -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