summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-18 21:34:00 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-18 21:34:00 +0000
commit227bd18d97c25d37c2c163a86497532d2c68691b (patch)
treef87dae295c57e5e324de02026288b08ca8e12a0a
parent235763bda6aa1156e3bbd2d7f7f17da3e01226cd (diff)
parent90de4dbc097d80805a12df45aef54d984feeadd9 (diff)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914021'] into tm-platform-release.
Change-Id: I23115d8b005f87e0de24efba20ae2e8f13e5acf5
-rw-r--r--media/mtp/MtpProperty.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/mtp/MtpProperty.h b/media/mtp/MtpProperty.h
index 36d736065f..2bdbfd3262 100644
--- a/media/mtp/MtpProperty.h
+++ b/media/mtp/MtpProperty.h
@@ -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;