commit e6d09667c9b78cd0bbc64a3ca89295f7b6290204
author Yung Ti Su <andysu@google.com> Thu Jul 13 12:52:21 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 13 12:52:21 2023 +0000
tree b25482d603c0451f79299d5b2845b090704a0a1b
parent b4fbe0b144dc8e452697d2947be8936349e43ecf
parent 8ed6d79d97e09d9ed23f23fbd67f33764a417720

Merge "libaudiohal: implement supportsBluetoothVariableLatency for HIDL" into udc-d1-dev

camera/ndk/impl/ACameraMetadata.cpp

diff --git a/camera/ndk/impl/ACameraMetadata.cpp b/camera/ndk/impl/ACameraMetadata.cpp
index 4995dc4..1fd4a86 100644
--- a/camera/ndk/impl/ACameraMetadata.cpp
+++ b/camera/ndk/impl/ACameraMetadata.cpp
@@ -400,7 +400,6 @@
 
     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

diff --git a/media/mtp/MtpProperty.h b/media/mtp/MtpProperty.h
index 36d7360..2bdbfd3 100644
--- a/media/mtp/MtpProperty.h
+++ b/media/mtp/MtpProperty.h
@@ -26,6 +26,9 @@
 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;