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

Commit 6f07a0dc authored by John Reck's avatar John Reck
Browse files

Add missing resume() call 

 Bug: 14087850

Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
parent 6313b925

core/java/android/view/GLES20Canvas.java

+0 −11
Original line number Diff line number Diff line
@@ -378,17 +378,6 @@ class GLES20Canvas extends HardwareCanvas { 


    private static native void nDrawLayer(long renderer, long layer, float x, float y);



    void interrupt() {

        nInterrupt(mRenderer);

    }

    

    void resume() {

        nResume(mRenderer);

    }



    private static native void nInterrupt(long renderer);

    private static native void nResume(long renderer);



    ///////////////////////////////////////////////////////////////////////////

    // Support

    ///////////////////////////////////////////////////////////////////////////

core/jni/android_view_GLES20Canvas.cpp

+0 −15
Original line number Diff line number Diff line
@@ -893,18 +893,6 @@ static jint android_view_GLES20Canvas_drawDisplayList(JNIEnv* env, 
// Layers

// ----------------------------------------------------------------------------



static void android_view_GLES20Canvas_interrupt(JNIEnv* env, jobject clazz,

        jlong rendererPtr) {

    OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr);

    renderer->interrupt();

}



static void android_view_GLES20Canvas_resume(JNIEnv* env, jobject clazz,

        jlong rendererPtr) {

    OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr);

    renderer->resume();

}



static void android_view_GLES20Canvas_drawLayer(JNIEnv* env, jobject clazz,

        jlong rendererPtr, jlong layerPtr, jfloat x, jfloat y) {

    OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr);
@@ -1093,9 +1081,6 @@ static JNINativeMethod gMethods[] = { 


    { "nCreateDisplayListRenderer", "()J",     (void*) android_view_GLES20Canvas_createDisplayListRenderer },



    { "nInterrupt",              "(J)V",       (void*) android_view_GLES20Canvas_interrupt },

    { "nResume",                 "(J)V",       (void*) android_view_GLES20Canvas_resume },



    { "nDrawLayer",              "(JJFF)V",    (void*) android_view_GLES20Canvas_drawLayer },

    { "nCopyLayer",              "(JJ)Z",      (void*) android_view_GLES20Canvas_copyLayer },

    { "nClearLayerUpdates",      "(J)V",       (void*) android_view_GLES20Canvas_clearLayerUpdates },

libs/hwui/renderthread/CanvasContext.cpp

+4 −0
Original line number Diff line number Diff line
@@ -445,6 +445,10 @@ void CanvasContext::invokeFunctor(Functor* functor) { 
    DrawGlInfo dummyInfo;

    memset(&dummyInfo, 0, sizeof(DrawGlInfo));

    (*functor)(mode, &dummyInfo);



    if (mCanvas) {

        mCanvas->resume();

    }

}



bool CanvasContext::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) {