Commit: f610edbc8f6a463b76521231a905f2534c774182 - frameworks-av (git)

frameworks/av

Commit MetaInfo

• Revision: f610edbc8f6a463b76521231a905f2534c774182 (tree)
• Time: 2016-09-26 14:52:44
• Author: Xuefer <xuefer@gmai...>
• Commiter: Gerrit Code Review

Log Message

audiopolicy: fix compiling for legacy audio

Change-Id: I3597e4c934addb920ddd356f4893ea77638c8cca
Signed-off-by: Xuefer <[e-mail]>

Change Summary

• modified: services/audiopolicy/AudioPolicyInterface.h
• modified: services/audiopolicy/service/AudioPolicyClientImplLegacy.cpp

Incremental Difference

--- a/services/audiopolicy/AudioPolicyInterface.h
+++ b/services/audiopolicy/AudioPolicyInterface.h
@@ -345,8 +345,10 @@ public:
 
 };
 
+#ifndef USE_LEGACY_AUDIO_POLICY
 extern "C" AudioPolicyInterface* createAudioPolicyManager(AudioPolicyClientInterface *clientInterface);
 extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface);
+#endif
 
 
 }; // namespace android

--- a/services/audiopolicy/service/AudioPolicyClientImplLegacy.cpp
+++ b/services/audiopolicy/service/AudioPolicyClientImplLegacy.cpp
@@ -56,7 +56,7 @@ audio_module_handle_t aps_load_hw_module(void *service __unused,
     sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();
     if (af == 0) {
         ALOGW("%s: could not get AudioFlinger", __func__);
-        return 0;
+        return AUDIO_MODULE_HANDLE_NONE;
     }
 
     return af->loadHwModule(name);