Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 370929f4 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am d23b2747: Merge "Finish current Canvas operations then resume previous... 

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

* commit 'd23b2747':
  Finish current Canvas operations then resume previous Canvas Bug #8297260
parents e94fcd6c d23b2747

core/java/android/view/GLES20RenderLayer.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -89,13 +89,13 @@ class GLES20RenderLayer extends GLES20Layer { 




    @Override

    @Override

    void end(Canvas currentCanvas) {

    void end(Canvas currentCanvas) {

        if (currentCanvas instanceof GLES20Canvas) {

            ((GLES20Canvas) currentCanvas).resume();

        }

        HardwareCanvas canvas = getCanvas();

        HardwareCanvas canvas = getCanvas();

        if (canvas != null) {

        if (canvas != null) {

            canvas.onPostDraw();

            canvas.onPostDraw();

        }

        }

        if (currentCanvas instanceof GLES20Canvas) {

            ((GLES20Canvas) currentCanvas).resume();

        }

    }

    }





    @Override

    @Override