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

Commit 2e85fba8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [camera]" into main am: 0188ed17 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2717293



Change-Id: I36d8c619d51ba4add5d942b8c252397e2e75cce8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df50b6d3 0188ed17

camera/CameraBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, 
        c->mStatus = NO_ERROR;

    } else {

        ALOGW("An error occurred while connecting to camera %d: %s", cameraId,

                (cs == nullptr) ? "Service not available" : ret.toString8().string());

                (cs == nullptr) ? "Service not available" : ret.toString8().c_str());

        c.clear();

    }

    return c;
@@ -270,7 +270,7 @@ int CameraBase<TCam, TCamTraits>::getNumberOfCameras() { 
            &count);

    if (!res.isOk()) {

        ALOGE("Error reading number of cameras: %s",

                res.toString8().string());

                res.toString8().c_str());

        count = 0;

    }

    return count;

camera/CameraMetadata.cpp

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ status_t CameraMetadata::update(uint32_t tag, 
        return res;

    }

    // string.size() doesn't count the null termination character.

    return updateImpl(tag, (const void*)string.string(), string.size() + 1);

    return updateImpl(tag, (const void*)string.c_str(), string.size() + 1);

}



status_t CameraMetadata::update(const camera_metadata_ro_entry &entry) {
@@ -809,7 +809,7 @@ status_t CameraMetadata::getTagFromName(const char *name, 
    for (size_t i = 0; i < totalSectionCount; ++i) {



        const char *str = (i < ANDROID_SECTION_COUNT) ? camera_metadata_section_names[i] :

                (*vendorSections)[i - ANDROID_SECTION_COUNT].string();

                (*vendorSections)[i - ANDROID_SECTION_COUNT].c_str();



        ALOGV("%s: Trying to match against section '%s'", __FUNCTION__, str);

camera/CameraParameters.cpp

+5 −5
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ String8 CameraParameters::flatten() const 


void CameraParameters::unflatten(const String8 &params)

{

    const char *a = params.string();

    const char *a = params.c_str();

    const char *b;



    mMap.clear();
@@ -271,7 +271,7 @@ const char *CameraParameters::get(const char *key) const 
    String8 v = mMap.valueFor(String8(key));

    if (v.length() == 0)

        return 0;

    return v.string();

    return v.c_str();

}



int CameraParameters::getInt(const char *key) const
@@ -463,7 +463,7 @@ void CameraParameters::dump() const 
        String8 k, v;

        k = mMap.keyAt(i);

        v = mMap.valueAt(i);

        ALOGD("%s: %s\n", k.string(), v.string());

        ALOGD("%s: %s\n", k.c_str(), v.c_str());

    }

}
@@ -478,10 +478,10 @@ status_t CameraParameters::dump(int fd, const Vector<String16>& /*args*/) const 
        String8 k, v;

        k = mMap.keyAt(i);

        v = mMap.valueAt(i);

        snprintf(buffer, 255, "\t%s: %s\n", k.string(), v.string());

        snprintf(buffer, 255, "\t%s: %s\n", k.c_str(), v.c_str());

        result.append(buffer);

    }

    write(fd, result.string(), result.size());

    write(fd, result.c_str(), result.size());

    return NO_ERROR;

}

camera/CameraParameters2.cpp

+7 −7
Original line number Diff line number Diff line
@@ -52,14 +52,14 @@ String8 CameraParameters2::flatten() const 
            flattened += ";";

    }



    ALOGV("%s: Flattened params = %s", __FUNCTION__, flattened.string());

    ALOGV("%s: Flattened params = %s", __FUNCTION__, flattened.c_str());



    return flattened;

}



void CameraParameters2::unflatten(const String8 &params)

{

    const char *a = params.string();

    const char *a = params.c_str();

    const char *b;



    mMap.clear();
@@ -128,7 +128,7 @@ const char *CameraParameters2::get(const char *key) const 
    if (idx < 0) {

        return NULL;

    } else {

        return mMap.valueAt(idx).string();

        return mMap.valueAt(idx).c_str();

    }

}
@@ -305,7 +305,7 @@ void CameraParameters2::getPreviewFpsRange(int *min_fps, int *max_fps) const 
void CameraParameters2::setPreviewFpsRange(int min_fps, int max_fps)

{

    String8 str = String8::format("%d,%d", min_fps, max_fps);

    set(CameraParameters::KEY_PREVIEW_FPS_RANGE, str.string());

    set(CameraParameters::KEY_PREVIEW_FPS_RANGE, str.c_str());

}



void CameraParameters2::setPreviewFormat(const char *format)
@@ -357,7 +357,7 @@ void CameraParameters2::dump() const 
        String8 k, v;

        k = mMap.keyAt(i);

        v = mMap.valueAt(i);

        ALOGD("%s: %s\n", k.string(), v.string());

        ALOGD("%s: %s\n", k.c_str(), v.c_str());

    }

}
@@ -373,10 +373,10 @@ status_t CameraParameters2::dump(int fd, const Vector<String16>& args) const 
        String8 k, v;

        k = mMap.keyAt(i);

        v = mMap.valueAt(i);

        snprintf(buffer, 255, "\t%s: %s\n", k.string(), v.string());

        snprintf(buffer, 255, "\t%s: %s\n", k.c_str(), v.c_str());

        result.append(buffer);

    }

    write(fd, result.string(), result.size());

    write(fd, result.c_str(), result.size());

    return NO_ERROR;

}

camera/VendorTagDescriptor.cpp

+5 −5
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ const char* VendorTagDescriptor::getSectionName(uint32_t tag) const { 
    if (index < 0) {

        return VENDOR_SECTION_NAME_ERR;

    }

    return mSections[mTagToSectionMap.valueAt(index)].string();

    return mSections[mTagToSectionMap.valueAt(index)].c_str();

}



const char* VendorTagDescriptor::getTagName(uint32_t tag) const {
@@ -245,7 +245,7 @@ const char* VendorTagDescriptor::getTagName(uint32_t tag) const { 
    if (index < 0) {

        return VENDOR_TAG_NAME_ERR;

    }

    return mTagToNameMap.valueAt(index).string();

    return mTagToNameMap.valueAt(index).c_str();

}



int VendorTagDescriptor::getTagType(uint32_t tag) const {
@@ -299,13 +299,13 @@ const SortedVector<String8>* VendorTagDescriptor::getAllSectionNames() const { 
status_t VendorTagDescriptor::lookupTag(const String8& name, const String8& section, /*out*/uint32_t* tag) const {

    ssize_t index = mReverseMapping.indexOfKey(section);

    if (index < 0) {

        ALOGE("%s: Section '%s' does not exist.", __FUNCTION__, section.string());

        ALOGE("%s: Section '%s' does not exist.", __FUNCTION__, section.c_str());

        return BAD_VALUE;

    }



    ssize_t nameIndex = mReverseMapping[index]->indexOfKey(name);

    if (nameIndex < 0) {

        ALOGE("%s: Tag name '%s' does not exist.", __FUNCTION__, name.string());

        ALOGE("%s: Tag name '%s' does not exist.", __FUNCTION__, name.c_str());

        return BAD_VALUE;

    }
@@ -344,7 +344,7 @@ void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const { 
        const char* typeName = (type >= 0 && type < NUM_TYPES) ?

                camera_metadata_type_names[type] : "UNKNOWN";

        dprintf(fd, "%*s0x%x (%s) with type %d (%s) defined in section %s\n", indentation + 2,

            "", tag, name.string(), type, typeName, sectionName.string());

            "", tag, name.c_str(), type, typeName, sectionName.c_str());

    }



}