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

Commit f671d5bb authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

resolve merge conflicts of 70066d92 to stage-aosp-master 

am: 311f99ea

Change-Id: I8264ed7436d6ffce3106085efad14a58da2f50b5
parents 1f1fa8ba 311f99ea

camera/VendorTagDescriptor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ status_t VendorTagDescriptor::readFromParcel(const Parcel* parcel) { 
    // Set up reverse mapping

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

        uint32_t tag = allTags[i];

        String8 sectionString = mSections[mTagToSectionMap.valueFor(tag)];

        const String8& sectionString = mSections[mTagToSectionMap.valueFor(tag)];



        ssize_t reverseIndex = -1;

        if ((reverseIndex = mReverseMapping.indexOfKey(sectionString)) < 0) {
@@ -284,7 +284,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
@@ -89,7 +89,7 @@ class VendorTagDescriptor : public Parcelable { 
         *

         * 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/CameraFlashlight.cpp

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

services/camera/libcameraservice/CameraFlashlight.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ class CameraHardwareInterfaceFlashControl : public FlashControlBase { 
        status_t disconnectCameraDevice();



        // initialize the preview window

        status_t initializePreviewWindow(sp<CameraHardwareInterface> device,

        status_t initializePreviewWindow(const sp<CameraHardwareInterface>& device,

                int32_t width, int32_t height);



        // start preview and enable torch

services/camera/libcameraservice/CameraService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2367,7 +2367,7 @@ String8 CameraService::CameraState::getId() const { 
void CameraService::ClientEventListener::onClientAdded(

        const resource_policy::ClientDescriptor<String8,

        sp<CameraService::BasicClient>>& descriptor) {

    auto basicClient = descriptor.getValue();

    const auto& basicClient = descriptor.getValue();

    if (basicClient.get() != nullptr) {

        BatteryNotifier& notifier(BatteryNotifier::getInstance());

        notifier.noteStartCamera(descriptor.getKey(),
@@ -2378,7 +2378,7 @@ void CameraService::ClientEventListener::onClientAdded( 
void CameraService::ClientEventListener::onClientRemoved(

        const resource_policy::ClientDescriptor<String8,

        sp<CameraService::BasicClient>>& descriptor) {

    auto basicClient = descriptor.getValue();

    const auto& basicClient = descriptor.getValue();

    if (basicClient.get() != nullptr) {

        BatteryNotifier& notifier(BatteryNotifier::getInstance());

        notifier.noteStopCamera(descriptor.getKey(),