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

Commit d5ea6e11 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev

parents e0a2435c 7b29779d

core/jni/android_hardware_Camera.cpp

+2 −2
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static void android_hardware_Camera_setPreviewDisplay(JNIEnv *env, jobject thiz, 
        }

    }



    if (camera->setPreviewTexture(gbp) != NO_ERROR) {

    if (camera->setPreviewTarget(gbp) != NO_ERROR) {

        jniThrowException(env, "java/io/IOException", "setPreviewTexture failed");

    }

}
@@ -576,7 +576,7 @@ static void android_hardware_Camera_setPreviewTexture(JNIEnv *env, 


    }



    if (camera->setPreviewTexture(producer) != NO_ERROR) {

    if (camera->setPreviewTarget(producer) != NO_ERROR) {

        jniThrowException(env, "java/io/IOException",

                "setPreviewTexture failed");

    }