commit 6a54e8bceec4158f064f267d87c9c75988200422
author Linux Build Service Account <lnxbuild@localhost> Thu May 17 04:20:03 2018 -0600
committer Linux Build Service Account <lnxbuild@localhost> Thu May 17 04:20:03 2018 -0600
tree b757a4689f6193272835711a9b907c94a0e6ead7
parent f74fa5a5d3f0e364361b9089a6823b5174402071
parent e2a2493c6a2bd9dc07c4114e0b6aa56a23bdb8bc

Merge e2a2493c6a2bd9dc07c4114e0b6aa56a23bdb8bc on remote branch

Change-Id: Idd3030dcc80aac5dbd60254c02974fea35c7e5e7

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 1328eef..fbb446a 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1427,11 +1427,10 @@
         audio_devices_t device,
         audio_session_t session,
         audio_stream_type_t stream,
-        audio_io_handle_t originalOutput,
         const audio_config_t *config,
         audio_output_flags_t *flags)
 {
-    audio_io_handle_t output = originalOutput;
+    audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
     status_t status;
 
     if (stream < AUDIO_STREAM_MIN || stream >= AUDIO_STREAM_CNT) {

policy_hal/AudioPolicyManager.h

diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h
index ce3da2f..9e58dcf 100644
--- a/policy_hal/AudioPolicyManager.h
+++ b/policy_hal/AudioPolicyManager.h
@@ -169,7 +169,6 @@
                 audio_devices_t device,
                 audio_session_t session,
                 audio_stream_type_t stream,
-                audio_io_handle_t originalOutput,
                 const audio_config_t *config,
                 audio_output_flags_t *flags);