summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-08-24 19:05:27 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> 2023-08-24 23:16:46 +0000
commit112f0af6aa2535b2f5ec30b40ba9d71c503e7b21 (patch)
tree5e38cc956a963b4773b6f0bd29f526b341bebeaa
parent34b915e1419a2fa18c8815d9b3193a02968c2047 (diff)
Migrate from android::String isEmpty to empty [camera]
This empty method is different from the old one - it aligns with std::string definition. Bug: 295394788 Test: make checkbuild Change-Id: I5716c283b6fb478acbcb62991700d5f971b6f54c
-rw-r--r--core/jni/android_hardware_Camera.cpp2
-rw-r--r--core/jni/android_hardware_camera2_CameraMetadata.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 1c597424f221..eb49f411159c 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -874,7 +874,7 @@ static jstring android_hardware_Camera_getParameters(JNIEnv *env, jobject thiz)
if (camera == 0) return 0;
String8 params8 = camera->getParameters();
- if (params8.isEmpty()) {
+ if (params8.empty()) {
jniThrowRuntimeException(env, "getParameters failed (empty parameters)");
return 0;
}
diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp
index 5293c583cfd0..3e4c7c7f751e 100644
--- a/core/jni/android_hardware_camera2_CameraMetadata.cpp
+++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp
@@ -526,7 +526,7 @@ static void CameraMetadata_dump(JNIEnv *env, jclass thiz, jlong ptr) {
"Failed to read from fd (errno = %#x, message = '%s')",
errno, strerror(errno));
//return;
- } else if (!logLine.isEmpty()) {
+ } else if (!logLine.empty()) {
ALOGD("%s", logLine.string());
}