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

Commit c755d7d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Migrate from android::String isEmpty to empty [camera]" into main

parents 1de56955 112f0af6

core/jni/android_hardware_Camera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

core/jni/android_hardware_camera2_CameraMetadata.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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());

        }