commit ee2bd54ef43cb1d98b485f025522ff88177bed0e
author Eric Laurent <elaurent@google.com> Wed Mar 14 15:02:33 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 14 15:02:33 2012 -0700
tree 119df3941dcd169cd90f721f9189e2f46cad2bd0
parent dbd5592c66b4be08778c17fd7f3632bedf60a087
parent 36ce859924ea0564099802760471a55d05dec42e

Merge "audio policy manager refactoring."

libaudio/Android.mk

diff --git a/libaudio/Android.mk b/libaudio/Android.mk
index d88c9ee..1d9b125 100644
--- a/libaudio/Android.mk
+++ b/libaudio/Android.mk
@@ -22,10 +22,6 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_MODULE_TAGS := optional
 
-ifeq ($(BOARD_HAVE_BLUETOOTH),true)
-  LOCAL_CFLAGS += -DWITH_A2DP
-endif
-
 include $(BUILD_SHARED_LIBRARY)
 
 

libaudio/AudioPolicyManager.h

diff --git a/libaudio/AudioPolicyManager.h b/libaudio/AudioPolicyManager.h
index 561e90b..e4417c0 100644
--- a/libaudio/AudioPolicyManager.h
+++ b/libaudio/AudioPolicyManager.h
@@ -37,10 +37,6 @@
 protected:
         // true is current platform implements a back microphone
         virtual bool hasBackMicrophone() const { return false; }
-#ifdef WITH_A2DP
-        // true is current platform supports suplication of notifications and ringtones over A2DP output
-        virtual bool a2dpUsedForSonification() const { return true; }
-#endif
 
 };
 };