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

Commit 7192b74c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10477539 from 0b1194f6 to udc-qpr1-release 

Change-Id: I03625b98fdc15772be6a73baf0de28a4bcb268e7
parents 859b152d 0b1194f6

camera/ndk/impl/ACameraMetadata.cpp

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ ACameraMetadata::getConstEntry(uint32_t tag, ACameraMetadata_const_entry* entry) 


    camera_metadata_ro_entry rawEntry = static_cast<const CameraMetadata*>(mData.get())->find(tag);

    if (rawEntry.count == 0) {

        ALOGE("%s: cannot find metadata tag %d", __FUNCTION__, tag);

        return ACAMERA_ERROR_METADATA_NOT_FOUND;

    }

    entry->tag = tag;

media/mtp/MtpProperty.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ namespace android { 
class MtpDataPacket;



struct MtpPropertyValue {

    // pointer str initialized to NULL so that free operation

    // is not called for pre-assigned value

    MtpPropertyValue() : str (NULL) {}

    union {

        int8_t          i8;

        uint8_t         u8;