Merge "Reapply "camera2 jni: nativeReadValues() can use camera_metadata_ro_entry instead of camera_metadata_entry"" into main
diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp
index 041fed7..a098737 100644
--- a/core/jni/android_hardware_camera2_CameraMetadata.cpp
+++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp
@@ -336,7 +336,7 @@
static jbyteArray CameraMetadata_readValues(JNIEnv *env, jclass thiz, jint tag, jlong ptr) {
ALOGV("%s (tag = %d)", __FUNCTION__, tag);
- CameraMetadata* metadata = CameraMetadata_getPointerThrow(env, ptr);
+ const CameraMetadata *metadata = CameraMetadata_getPointerThrow(env, ptr);
if (metadata == NULL) return NULL;
const camera_metadata_t *metaBuffer = metadata->getAndLock();
@@ -349,16 +349,15 @@
}
size_t tagSize = Helpers::getTypeSize(tagType);
- camera_metadata_entry entry = metadata->find(tag);
+ camera_metadata_ro_entry entry = metadata->find(tag);
if (entry.count == 0) {
- if (!metadata->exists(tag)) {
- ALOGV("%s: Tag %d does not have any entries", __FUNCTION__, tag);
- return NULL;
- } else {
- // OK: we will return a 0-sized array.
- ALOGV("%s: Tag %d had an entry, but it had 0 data", __FUNCTION__,
- tag);
- }
+ if (!metadata->exists(tag)) {
+ ALOGV("%s: Tag %d does not have any entries", __FUNCTION__, tag);
+ return NULL;
+ } else {
+ // OK: we will return a 0-sized array.
+ ALOGV("%s: Tag %d had an entry, but it had 0 data", __FUNCTION__, tag);
+ }
}
jsize byteCount = entry.count * tagSize;