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

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

Browse Source 
* commit 'd5ea6e113cfd573859f0966ae71cdcfd3d5e5f51':
  Camera1: Rename setPreviewTexture to ...Target for clarity
This commit is contained in:
Eino-Ville Talvala
2013-08-21 20:11:18 -07:00
committed by Android Git Automerger
parent b7db6d73a4 d5ea6e113c
commit 1de3ac6463
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_hardware_Camera.cpp
View File

@@ -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"); 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", jniThrowException(env, "java/io/IOException",
"setPreviewTexture failed"); "setPreviewTexture failed");
} }