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

Commit a7ddf89b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "cameraservice: remove String\d+::std_string"

parents 3ecd658d 5ff9c91a

services/camera/libcameraservice/CameraService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ Status CameraService::getCameraCharacteristics(const String16& cameraId, 
        }

    } else {

        status_t res = mCameraProviderManager->getCameraCharacteristics(

                String16::std_string(cameraId), cameraInfo);

                String8(cameraId).string(), cameraInfo);

        if (res != OK) {

            return STATUS_ERROR_FMT(ERROR_INVALID_OPERATION, "Unable to retrieve camera "

                    "characteristics for device %s: %s (%d)", String8(cameraId).string(),
@@ -689,14 +689,14 @@ int CameraService::getDeviceVersion(const String8& cameraId, int* facing) { 
    } else {

        status_t res;

        hardware::hidl_version maxVersion{0,0};

        res = mCameraProviderManager->getHighestSupportedVersion(String8::std_string(cameraId),

        res = mCameraProviderManager->getHighestSupportedVersion(cameraId.string(),

                &maxVersion);

        if (res != OK) return -1;

        deviceVersion = HARDWARE_DEVICE_API_VERSION(maxVersion.get_major(), maxVersion.get_minor());



        hardware::CameraInfo info;

        if (facing) {

            res = mCameraProviderManager->getCameraInfo(String8::std_string(cameraId), &info);

            res = mCameraProviderManager->getCameraInfo(cameraId.string(), &info);

            if (res != OK) return -1;

            *facing = info.facing;

        }

services/camera/libcameraservice/device1/CameraHardwareInterface.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ status_t CameraHardwareInterface::initialize(sp<CameraProviderManager> manager) 


    ALOGI("Opening camera %s", mName.string());



    status_t ret = manager->openSession(String8::std_string(mName), this, &mHidlDevice);

    status_t ret = manager->openSession(mName.string(), this, &mHidlDevice);

    if (ret != OK) {

        ALOGE("%s: openSession failed! %s (%d)", __FUNCTION__, strerror(-ret), ret);

    }

services/camera/libcameraservice/device3/Camera3Device.cpp

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ status_t Camera3Device::initialize(sp<CameraProviderManager> manager) { 


    sp<ICameraDeviceSession> session;

    ATRACE_BEGIN("CameraHal::openSession");

    status_t res = manager->openSession(String8::std_string(mId), this,

    status_t res = manager->openSession(mId.string(), this,

            /*out*/ &session);

    ATRACE_END();

    if (res != OK) {
@@ -191,7 +191,7 @@ status_t Camera3Device::initialize(sp<CameraProviderManager> manager) { 
        return res;

    }



    res = manager->getCameraCharacteristics(String8::std_string(mId), &mDeviceInfo);

    res = manager->getCameraCharacteristics(mId.string(), &mDeviceInfo);

    if (res != OK) {

        SET_ERR_L("Could not retrive camera characteristics: %s (%d)", strerror(-res), res);

        session->close();