Merge "Update logic to set legacy remote submix rrid." into rvc-dev am:... (2a5646df) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/RecordingActivityMonitor.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -150,16 +150,16 @@ 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);
		}
		}
		}
		if (MediaRecorder.isSystemOnlyAudioSource(source)) {
		// still want to log event, it just won't appear in recording configurations;
		sEventLogger.log(new RecordingEvent(event, riid, config).printLog(TAG));