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

Commit 8bbf58f3 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 7bc559a1 to master 

Change-Id: I28b0ad637a8a992db16442131501a2715f2cf9a2
parents d0a39e43 7bc559a1

camera/VendorTagDescriptor.cpp

+1 −1
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) {

services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ status_t StreamingProcessor::setPreviewWindow(const sp<Surface>& window) { 
    return OK;

}



status_t StreamingProcessor::setRecordingWindow(sp<Surface> window) {

status_t StreamingProcessor::setRecordingWindow(const sp<Surface>& window) {

    ATRACE_CALL();

    status_t res;

services/camera/libcameraservice/api1/client2/StreamingProcessor.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class StreamingProcessor : public virtual VirtualLightRefBase { 
    ~StreamingProcessor();



    status_t setPreviewWindow(const sp<Surface>& window);

    status_t setRecordingWindow(sp<Surface> window);

    status_t setRecordingWindow(const sp<Surface>& window);



    bool haveValidPreviewWindow() const;

    bool haveValidRecordingWindow() const;