diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-08-22 00:50:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-22 00:50:55 +0000 |
| commit | d5ea6e113cfd573859f0966ae71cdcfd3d5e5f51 (patch) | |
| tree | a72a7858307063f6cd005eeaa82173afdef6d5ea /core/jni | |
| parent | e0a2435cb390c4333e3d40ede4d163566d779962 (diff) | |
| parent | 7b29779d970deb13c41e4a762df9c16544d83a05 (diff) | |
| download | frameworks_base-d5ea6e113cfd573859f0966ae71cdcfd3d5e5f51.zip frameworks_base-d5ea6e113cfd573859f0966ae71cdcfd3d5e5f51.tar.gz frameworks_base-d5ea6e113cfd573859f0966ae71cdcfd3d5e5f51.tar.bz2 | |
Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 0018dd2..09d8d0f 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -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"); } |