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

Commit 7efad644 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "stop using a deprecated SurfaceTextureClient ctor"

parents 4274d3f6 82bb813f

core/jni/android/graphics/SurfaceTexture.cpp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ sp<ANativeWindow> android_SurfaceTexture_getNativeWindow( 
{

    sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

    sp<SurfaceTextureClient> surfaceTextureClient(surfaceTexture != NULL ?

            new SurfaceTextureClient(surfaceTexture) : NULL);

            new SurfaceTextureClient(surfaceTexture->getBufferQueue()) : NULL);

    return surfaceTextureClient;

}

core/jni/android_opengl_EGL14.cpp

+5 −1
Original line number Diff line number Diff line
@@ -627,7 +627,11 @@ not_valid_surface: 
        goto exit;

    }

    surfaceTexture = android::SurfaceTexture_getSurfaceTexture(_env, win);

    window = new android::SurfaceTextureClient(surfaceTexture);



    if (surfaceTexture == NULL)

        goto not_valid_surface;



    window = new android::SurfaceTextureClient(surfaceTexture->getBufferQueue());



    if (window == NULL)

        goto not_valid_surface;

core/jni/android_view_TextureView.cpp

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void android_view_TextureView_createNativeWindow(JNIEnv* env, jobject tex 
        jobject surface) {



    sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, surface));

    sp<ANativeWindow> window = new SurfaceTextureClient(surfaceTexture);

    sp<ANativeWindow> window = new SurfaceTextureClient(surfaceTexture->getBufferQueue());



    window->incStrong(0);

    SET_INT(textureView, gTextureViewClassInfo.nativeWindow, jint(window.get()));

core/jni/com_google_android_gles_jni_EGLImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ not_valid_surface: 
    

    sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(_env, native_window));



    window = new SurfaceTextureClient(surfaceTexture);

    window = new SurfaceTextureClient(surfaceTexture->getBufferQueue());

    if (window == NULL)

        goto not_valid_surface;

graphics/jni/android_renderscript_RenderScript.cpp

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ nContextSetSurfaceTexture(JNIEnv *_env, jobject _this, RsContext con, jint width 


    } else {

        st = SurfaceTexture_getSurfaceTexture(_env, sur);

        window = new SurfaceTextureClient(st);

        window = new SurfaceTextureClient(st->getBufferQueue());

    }



    rsContextSetSurface(con, width, height, window.get());