From faeb0f291330134dc4468359a36e099aae508449 Mon Sep 17 00:00:00 2001
From: Ronghua Wu <ronghuawu@google.com>
Date: Thu, 21 May 2015 12:20:21 -0700
Subject: libmediaplayerservice: try to open audio sink in offload mode in
 error.

Bug: 19061432
Bug: 21370108
Change-Id: Iaa757555ef37fd1ac87b6e2d5a9969bb58cc5ebc
---
 media/libmediaplayerservice/MediaPlayerService.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index efbc0d6..9c0af4a 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1489,7 +1489,8 @@ status_t MediaPlayerService::AudioOutput::open(
         audio_format_t format, int bufferCount,
         AudioCallback cb, void *cookie,
         audio_output_flags_t flags,
-        const audio_offload_info_t *offloadInfo)
+        const audio_offload_info_t *offloadInfo,
+        bool doNotReconnect)
 {
     mCallback = cb;
     mCallbackCookie = cookie;
@@ -1605,7 +1606,8 @@ status_t MediaPlayerService::AudioOutput::open(
                     offloadInfo,
                     mUid,
                     mPid,
-                    mAttributes);
+                    mAttributes,
+                    doNotReconnect);
         } else {
             t = new AudioTrack(
                     mStreamType,
@@ -1622,7 +1624,8 @@ status_t MediaPlayerService::AudioOutput::open(
                     NULL, // offload info
                     mUid,
                     mPid,
-                    mAttributes);
+                    mAttributes,
+                    doNotReconnect);
         }
 
         if ((t == 0) || (t->initCheck() != NO_ERROR)) {
-- 
cgit v1.1