From c48921b1f58084671378e647f184f4bd18bf5d54 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Wed, 6 Nov 2013 21:42:35 +0100 Subject: [PATCH] Revert "FM Radio: Add support for FM Radio in Android" This reverts commit 1e07014af2319f08c128c7702251c42e71742edb. Change-Id: Ife5d06b4b4d65635d8c0d4d191392eb55f313243 --- include/system/audio.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/system/audio.h b/include/system/audio.h index 4852b96d..04238df8 100755 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -80,7 +80,6 @@ typedef enum { /* An example of remote presentation is Wifi Display */ /* where a dongle attached to a TV can be used to */ /* play the mix captured by this audio source. */ - AUDIO_SOURCE_FM_RADIO_RX = 9, AUDIO_SOURCE_CNT, AUDIO_SOURCE_MAX = AUDIO_SOURCE_CNT - 1, AUDIO_SOURCE_HOTWORD = 1999, /* A low-priority, preemptible audio source for @@ -397,9 +396,6 @@ enum { AUDIO_DEVICE_OUT_PROXY = 0x40000, AUDIO_DEVICE_OUT_FM = 0x80000, AUDIO_DEVICE_OUT_FM_TX = 0x100000, -#endif -#ifdef STE_FM - AUDIO_DEVICE_OUT_FM_TX = 0x10000, #endif AUDIO_DEVICE_OUT_DEFAULT = AUDIO_DEVICE_BIT_DEFAULT, AUDIO_DEVICE_OUT_ALL = (AUDIO_DEVICE_OUT_EARPIECE | @@ -424,9 +420,6 @@ enum { AUDIO_DEVICE_OUT_PROXY | AUDIO_DEVICE_OUT_FM | AUDIO_DEVICE_OUT_FM_TX | -#endif -#ifdef STE_FM - AUDIO_DEVICE_OUT_FM_TX | #endif AUDIO_DEVICE_OUT_DEFAULT), AUDIO_DEVICE_OUT_ALL_A2DP = (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP | @@ -473,9 +466,6 @@ enum { AUDIO_DEVICE_IN_PROXY = AUDIO_DEVICE_BIT_IN | 0x4000, AUDIO_DEVICE_IN_FM_RX = AUDIO_DEVICE_BIT_IN | 0x8000, AUDIO_DEVICE_IN_FM_RX_A2DP = AUDIO_DEVICE_BIT_IN | 0x10000, -#endif -#ifdef STE_FM - AUDIO_DEVICE_IN_FM_RX = AUDIO_DEVICE_BIT_IN | 0x2000, #endif AUDIO_DEVICE_IN_DEFAULT = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT, #endif @@ -498,9 +488,6 @@ enum { AUDIO_DEVICE_IN_FM_RX | AUDIO_DEVICE_IN_FM_RX_A2DP | AUDIO_DEVICE_IN_PROXY | -#endif -#ifdef STE_FM - AUDIO_DEVICE_IN_FM_RX | #endif AUDIO_DEVICE_IN_DEFAULT), AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,