Loading policy_hal/AudioPolicyManager.cpp +0 −7 Original line number Diff line number Diff line Loading @@ -26,7 +26,6 @@ #else #define ALOGVV(a...) do { } while(0) #endif #define MIN(a, b) ((a) < (b) ? (a) : (b)) // A device mask for all audio output devices that are considered "remote" when evaluating // active output devices in isStreamActiveRemotely() Loading @@ -35,9 +34,6 @@ // type alone is not enough: the address must match too #define APM_AUDIO_DEVICE_MATCH_ADDRESS_ALL (AUDIO_DEVICE_IN_REMOTE_SUBMIX | \ AUDIO_DEVICE_OUT_REMOTE_SUBMIX) // Following delay should be used if the calculated routing delay from all active // input streams is higher than this value #define MAX_VOICE_CALL_START_DELAY_MS 100 #include <inttypes.h> #include <math.h> Loading Loading @@ -877,9 +873,6 @@ void AudioPolicyManagerCustom::setPhoneState(audio_mode_t state) setStrategyMute(STRATEGY_SONIFICATION, false, desc, MUTE_TIME_MS, getDeviceForStrategy(STRATEGY_SONIFICATION, true /*fromCache*/)); } ALOGV("Setting the delay from %dms to %dms", delayMs, MIN(delayMs, MAX_VOICE_CALL_START_DELAY_MS)); delayMs = MIN(delayMs, MAX_VOICE_CALL_START_DELAY_MS); } if (hasPrimaryOutput()) { Loading Loading
policy_hal/AudioPolicyManager.cpp +0 −7 Original line number Diff line number Diff line Loading @@ -26,7 +26,6 @@ #else #define ALOGVV(a...) do { } while(0) #endif #define MIN(a, b) ((a) < (b) ? (a) : (b)) // A device mask for all audio output devices that are considered "remote" when evaluating // active output devices in isStreamActiveRemotely() Loading @@ -35,9 +34,6 @@ // type alone is not enough: the address must match too #define APM_AUDIO_DEVICE_MATCH_ADDRESS_ALL (AUDIO_DEVICE_IN_REMOTE_SUBMIX | \ AUDIO_DEVICE_OUT_REMOTE_SUBMIX) // Following delay should be used if the calculated routing delay from all active // input streams is higher than this value #define MAX_VOICE_CALL_START_DELAY_MS 100 #include <inttypes.h> #include <math.h> Loading Loading @@ -877,9 +873,6 @@ void AudioPolicyManagerCustom::setPhoneState(audio_mode_t state) setStrategyMute(STRATEGY_SONIFICATION, false, desc, MUTE_TIME_MS, getDeviceForStrategy(STRATEGY_SONIFICATION, true /*fromCache*/)); } ALOGV("Setting the delay from %dms to %dms", delayMs, MIN(delayMs, MAX_VOICE_CALL_START_DELAY_MS)); delayMs = MIN(delayMs, MAX_VOICE_CALL_START_DELAY_MS); } if (hasPrimaryOutput()) { Loading