From 727fef1b1a8cb6d6609ec99a749fcd9573a3417d Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Mon, 30 Sep 2013 19:20:15 -0700
Subject: remove audio HAL warning when inserting a headset

A valid offload info structure must be provided when
opening an offload output stream in checkOutputsForDevice()
upon headset insertion.

Bug: 8174034.
Change-Id: Id800a206536e5ce979febf89747a51db581c53b6
---
 audio/AudioPolicyManagerBase.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'audio')

diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index bc9cff4..3ee1f0f 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -1825,13 +1825,19 @@ status_t AudioPolicyManagerBase::checkOutputsForDevice(audio_devices_t device,
             ALOGV("opening output for device %08x", device);
             desc = new AudioOutputDescriptor(profile);
             desc->mDevice = device;
+            audio_offload_info_t offloadInfo = AUDIO_INFO_INITIALIZER;
+            offloadInfo.sample_rate = desc->mSamplingRate;
+            offloadInfo.format = desc->mFormat;
+            offloadInfo.channel_mask = desc->mChannelMask;
+
             audio_io_handle_t output = mpClientInterface->openOutput(profile->mModule->mHandle,
                                                                        &desc->mDevice,
                                                                        &desc->mSamplingRate,
                                                                        &desc->mFormat,
                                                                        &desc->mChannelMask,
                                                                        &desc->mLatency,
-                                                                       desc->mFlags);
+                                                                       desc->mFlags,
+                                                                       &offloadInfo);
             if (output != 0) {
                 if (desc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {
                     String8 reply;
-- 
cgit v1.1