Merge "Update logic to set legacy remote submix rrid." into rvc-dev am: 05a6fd9506

Change-Id: Ic2e545ef55cad0ff3c6e261a73da8b69c290c071
This commit is contained in:
Jiabin Huang
2020-04-03 04:05:06 +00:00
committed by Automerger Merge Worker

View File

@@ -150,14 +150,14 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin
final AudioRecordingConfiguration config = createRecordingConfiguration(
uid, session, source, recordingInfo,
portId, silenced, activeSource, clientEffects, effects);
if (source == MediaRecorder.AudioSource.REMOTE_SUBMIX) {
if (source == MediaRecorder.AudioSource.REMOTE_SUBMIX
&& (event == AudioManager.RECORD_CONFIG_EVENT_START
|| event == AudioManager.RECORD_CONFIG_EVENT_UPDATE)) {
final AudioDeviceInfo device = config.getAudioDevice();
if (AudioSystem.LEGACY_REMOTE_SUBMIX_ADDRESS.equals(device.getAddress())) {
if (device != null
&& AudioSystem.LEGACY_REMOTE_SUBMIX_ADDRESS.equals(device.getAddress())) {
mLegacyRemoteSubmixRiid.set(riid);
if (event == AudioManager.RECORD_CONFIG_EVENT_START
|| event == AudioManager.RECORD_CONFIG_EVENT_UPDATE) {
mLegacyRemoteSubmixActive.set(true);
}
mLegacyRemoteSubmixActive.set(true);
}
}
if (MediaRecorder.isSystemOnlyAudioSource(source)) {