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

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

Merge "Fix clang-tidy warnings in camera."

parents e4e2a8fc 5404ee17

camera/VendorTagDescriptor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ status_t VendorTagDescriptor::createDescriptorFromOps(const vendor_tag_ops_t* vO 


    for (size_t i = 0; i < static_cast<size_t>(tagCount); ++i) {

        uint32_t tag = tagArray[i];

        String8 sectionString = tagToSectionMap.valueFor(tag);

        const String8& sectionString = tagToSectionMap.valueFor(tag);



        // Set up tag to section index map

        ssize_t index = sections.indexOf(sectionString);
@@ -328,7 +328,7 @@ SortedVector<String8> VendorTagDescriptor::getAllSectionNames() const { 
    return mSections;

}



status_t VendorTagDescriptor::lookupTag(String8 name, String8 section, /*out*/uint32_t* tag) 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());

include/camera/VendorTagDescriptor.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ class VendorTagDescriptor 
         *

         * Returns OK on success, or a negative error code.

         */

        status_t lookupTag(String8 name, String8 section, /*out*/uint32_t* tag) const;

        status_t lookupTag(const String8& name, const String8& section, /*out*/uint32_t* tag) const;



        /**

         * Dump the currently configured vendor tags to a file descriptor.

services/camera/libcameraservice/CameraDeviceFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ sp<CameraDeviceBase> CameraDeviceFactory::createDevice(int cameraId) { 
    return device;

}



void CameraDeviceFactory::registerService(wp<CameraService> service) {

void CameraDeviceFactory::registerService(const wp<CameraService>& service) {

    ALOGV("%s: Registered service %p", __FUNCTION__,

          service.promote().get());

services/camera/libcameraservice/CameraDeviceFactory.h

+2 −2
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ class CameraService; 
 */

class CameraDeviceFactory : public virtual RefBase {

  public:

    static void registerService(wp<CameraService> service);

    static void registerService(const wp<CameraService>& service);



    // Prerequisite: Call registerService.

    static sp<CameraDeviceBase> createDevice(int cameraId);

  private:

    CameraDeviceFactory(wp<CameraService> service);

    explicit CameraDeviceFactory(wp<CameraService> service);



    static wp<CameraService> sService;

};

services/camera/libcameraservice/CameraFlashlight.cpp

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ status_t CameraHardwareInterfaceFlashControl::getSmallestSurfaceSize( 
}



status_t CameraHardwareInterfaceFlashControl::initializePreviewWindow(

        sp<CameraHardwareInterface> device, int32_t width, int32_t height) {

        const sp<CameraHardwareInterface>& device, int32_t width, int32_t height) {

    status_t res;

    BufferQueue::createBufferQueue(&mProducer, &mConsumer);