commit 59199b164e5ce9dd9f3540eb73e712f2f0e68f33
author Ricardo Cerqueira <cyanogenmod@cerqueira.org> Wed Jul 11 23:39:44 2012 +0100
committer andrew.boren <andrew.boren@gmail.com> Mon Dec 24 20:58:23 2012 -0700
tree 094f0f62d3b52a6687acef4a4b5aeb9e9135cf4d
parent 1336924a2c38a44c6f3bce2ab86f500e95a669d2

Add support for ICS audio blobs

Enable with the ICS_AUDIO_BLOB CFLAG

Change-Id: Ie174d5997202b8931c1f11db62b6ec2e377f096a

services/audioflinger/AudioPolicyService.cpp

diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp
index 8b99bd2..7dd46f2 100644
--- a/services/audioflinger/AudioPolicyService.cpp
+++ b/services/audioflinger/AudioPolicyService.cpp
@@ -388,12 +388,16 @@
         return BAD_VALUE;
     }
     Mutex::Autolock _l(mLock);
+
+#ifndef ICS_AUDIO_BLOB
     if (mpAudioPolicy->set_stream_volume_index_for_device) {
         return mpAudioPolicy->set_stream_volume_index_for_device(mpAudioPolicy,
                                                                 stream,
                                                                 index,
                                                                 device);
-    } else {
+    } else 
+#endif
+    {
         return mpAudioPolicy->set_stream_volume_index(mpAudioPolicy, stream, index);
     }
 }
@@ -409,12 +413,15 @@
         return BAD_VALUE;
     }
     Mutex::Autolock _l(mLock);
+#ifndef ICS_AUDIO_BLOB
     if (mpAudioPolicy->get_stream_volume_index_for_device) {
         return mpAudioPolicy->get_stream_volume_index_for_device(mpAudioPolicy,
                                                                 stream,
                                                                 index,
                                                                 device);
-    } else {
+    } else 
+#endif
+    {
         return mpAudioPolicy->get_stream_volume_index(mpAudioPolicy, stream, index);
     }
 }