commit defe30caceea40c6ef2bb864bef7d4fb6254f348
author The Android Open Source Project <initial-contribution@android.com> Fri Dec 06 02:50:49 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 06 02:50:49 2013 +0000
tree 1ae96be0e3baff80f17cac0c0c7803a3e250eb94
parent c58bb27d9228dd1993523769b73001e935b78441
parent 3f6b86a5baf26c621e65bb25fb2c671764ddc479

am 3f6b86a5: am e1d13d9e: Merge commit \'1ed341977485618189efe926120b291f0df3d33a\' into HEAD

* commit '3f6b86a5baf26c621e65bb25fb2c671764ddc479':

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 48c426d..972837b 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2356,7 +2356,6 @@
     adev->mode = AUDIO_MODE_NORMAL;
     adev->active_input = NULL;
     adev->primary_output = NULL;
-    adev->out_device = AUDIO_DEVICE_NONE;
     adev->voice_call_rx = NULL;
     adev->voice_call_tx = NULL;
     adev->voice_volume = 1.0f;

hal/audio_hw.h

diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 0da4324..e2d6ff7 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -173,7 +173,6 @@
     pthread_mutex_t lock; /* see note below on mutex acquisition order */
     struct mixer *mixer;
     audio_mode_t mode;
-    audio_devices_t out_device;
     struct stream_in *active_input;
     struct stream_out *primary_output;
     int in_call;