Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30917283 authored by Jiabin Huang's avatar Jiabin Huang Committed by Automerger Merge Worker
Browse files

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

Change-Id: If46fbef53e6b70accc0355a663ff34d87c95b847
parents 3f628376 05a6fd95

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));