commit e79290d111a9c72aff5eecf2a5eed63d3168c112
author Eric Laurent <elaurent@google.com> Thu Jan 31 11:05:45 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 31 11:05:45 2019 -0800
tree 117f088ecf9e3bd6c9346a9899ae4fd23c5f99c7
parent a521f1f1ddb25f4ec7968d4a326526696dd328c6
parent 46c631d9217a9fb1a3b32e138a11c824e5dd1497

Merge "Set default value to mAttributes in AudioTrack" am: 1128b3fa1a
am: 46c631d921

Change-Id: Ifa8f9d768acaf6ee9744010979dd669adb30185c

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index b728897..a3413e1 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -282,6 +282,11 @@
       mPreviousSchedulingGroup(SP_DEFAULT),
       mPausedPosition(0)
 {
+    mAttributes.content_type = AUDIO_CONTENT_TYPE_UNKNOWN;
+    mAttributes.usage = AUDIO_USAGE_UNKNOWN;
+    mAttributes.flags = 0x0;
+    strcpy(mAttributes.tags, "");
+
     (void)set(streamType, sampleRate, format, channelMask,
             frameCount, flags, cbf, user, notificationFrames,
             0 /*sharedBuffer*/, false /*threadCanCallJava*/, sessionId, transferType,
@@ -313,6 +318,11 @@
       mPausedPosition(0),
       mSelectedDeviceId(AUDIO_PORT_HANDLE_NONE)
 {
+    mAttributes.content_type = AUDIO_CONTENT_TYPE_UNKNOWN;
+    mAttributes.usage = AUDIO_USAGE_UNKNOWN;
+    mAttributes.flags = 0x0;
+    strcpy(mAttributes.tags, "");
+
     (void)set(streamType, sampleRate, format, channelMask,
             0 /*frameCount*/, flags, cbf, user, notificationFrames,
             sharedBuffer, false /*threadCanCallJava*/, sessionId, transferType, offloadInfo,