Revert "audio policy for concurrent capture."
This reverts commit 4b2fcd8abf90b1bd95539f9f4ef2ac39ce9e2df1.
Bug:26841909
Change-Id: Ifc74b195394b9fb3f73d33455ad061bd896d5331
diff --git a/services/audiopolicy/common/include/policy.h b/services/audiopolicy/common/include/policy.h
index e3ee4e5..34984f9 100755
--- a/services/audiopolicy/common/include/policy.h
+++ b/services/audiopolicy/common/include/policy.h
@@ -30,9 +30,9 @@
/**
* A device mask for all audio input devices that are considered "virtual" when evaluating
- * active inputs in getActiveInputs()
+ * active inputs in getActiveInput()
*/
-#define APM_AUDIO_IN_DEVICE_VIRTUAL_ALL (AUDIO_DEVICE_IN_REMOTE_SUBMIX)
+#define APM_AUDIO_IN_DEVICE_VIRTUAL_ALL (AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_FM_TUNER)
/**
@@ -88,41 +88,3 @@
(((device & AUDIO_DEVICE_BIT_IN) == 0) &&
((device & APM_AUDIO_DEVICE_OUT_MATCH_ADDRESS_ALL) != 0));
}
-
-/**
- * Returns the priority of a given audio source for capture. The priority is used when more than one
- * capture session is active on a given input stream to determine which session drives routing and
- * effect configuration.
- *
- * @param[in] inputSource to consider. Valid sources are:
- * - AUDIO_SOURCE_VOICE_COMMUNICATION
- * - AUDIO_SOURCE_CAMCORDER
- * - AUDIO_SOURCE_MIC
- * - AUDIO_SOURCE_FM_TUNER
- * - AUDIO_SOURCE_VOICE_RECOGNITION
- * - AUDIO_SOURCE_HOTWORD
- *
- * @return the corresponding input source priority or 0 if priority is irrelevant for this source.
- * This happens when the specified source cannot share a given input stream (e.g remote submix)
- * The higher the value, the higher the priority.
- */
-static inline int32_t source_priority(audio_source_t inputSource)
-{
- switch (inputSource) {
- case AUDIO_SOURCE_VOICE_COMMUNICATION:
- return 6;
- case AUDIO_SOURCE_CAMCORDER:
- return 5;
- case AUDIO_SOURCE_MIC:
- return 4;
- case AUDIO_SOURCE_FM_TUNER:
- return 3;
- case AUDIO_SOURCE_VOICE_RECOGNITION:
- return 2;
- case AUDIO_SOURCE_HOTWORD:
- return 1;
- default:
- break;
- }
- return 0;
-}