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

Commit 091cdd13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "cameraserver: Fix logs for transaction error while getting physical... 

Merge "cameraserver: Fix logs for transaction error while getting physical camera characteristics" into main
parents 2088f51b 8c54b331

services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp

+3 −2
Original line number Diff line number Diff line
@@ -607,8 +607,9 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3( 
            aidl::android::hardware::camera::device::CameraMetadata pChars;

            status = interface->getPhysicalCameraCharacteristics(id, &pChars);

            if (!status.isOk()) {

                ALOGE("%s: Transaction error getting physical camera %s characteristics for %s: %s",

                        __FUNCTION__, id.c_str(), id.c_str(), status.getMessage());

                ALOGE("%s: Transaction error getting physical camera %s characteristics for "

                        "logical id %s: %s", __FUNCTION__, id.c_str(), mId.c_str(),

                        status.getMessage());

                return;

            }

            std::vector<uint8_t> &pMetadata = pChars.metadata;

services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp

+3 −2
Original line number Diff line number Diff line
@@ -743,8 +743,9 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 
            });



            if (!ret.isOk()) {

                ALOGE("%s: Transaction error getting physical camera %s characteristics for %s: %s",

                        __FUNCTION__, id.c_str(), id.c_str(), ret.description().c_str());

                ALOGE("%s: Transaction error getting physical camera %s characteristics for"

                        " logical id %s: %s", __FUNCTION__, id.c_str(), mId.c_str(),

                        ret.description().c_str());

                return;

            }

            if (status != Status::OK) {