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

Commit 6c6e871f authored Dec 21, 2020 by Oscar Azucena

Refactored base code to getDeviceForPortId

Refactored base code to use AudioManager.getDeviceForPortId where
possible:
	AudioRecorder
	MediaRecorder
	AudioTrack
	MediaPlayer
	AudioPlaybackConfiguration
	AudioRecordingConfiguration

Bug: 175802592
Test: atest AudioPlaybackConfiguration
Test: atest AudioRecordingConfiguration
Test: atest AudioRecorderTest
Test: atest MediaRecorderTest
Change-Id: I15dfcd587fdc732e666a6dfec0de82f80512dad7

parent 1be37ac5

media/java/android/media/AudioPlaybackConfiguration.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -298,15 +298,7 @@ public final class AudioPlaybackConfiguration implements Parcelable {
		if (mDeviceId == PLAYER_DEVICEID_INVALID) {
		return null;
		}
		// TODO(175802592): change this to AudioManager.getDeviceForPortId() when available
		AudioDeviceInfo[] devices =
		AudioManager.getDevicesStatic(AudioManager.GET_DEVICES_OUTPUTS);
		for (int i = 0; i < devices.length; i++) {
		if (devices[i].getId() == mDeviceId) {
		return devices[i];
		}
		}
		return null;
		return AudioManager.getDeviceForPortId(mDeviceId, AudioManager.GET_DEVICES_OUTPUTS);
		}

		/**

media/java/android/media/AudioRecord.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -1578,14 +1578,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection,
		if (deviceId == 0) {
		return null;
		}
		AudioDeviceInfo[] devices =
		AudioManager.getDevicesStatic(AudioManager.GET_DEVICES_INPUTS);
		for (int i = 0; i < devices.length; i++) {
		if (devices[i].getId() == deviceId) {
		return devices[i];
		}
		}
		return null;
		return AudioManager.getDeviceForPortId(deviceId, AudioManager.GET_DEVICES_INPUTS);
		}

		/*

media/java/android/media/AudioRecordingConfiguration.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -262,14 +262,8 @@ public final class AudioRecordingConfiguration implements Parcelable {
		final AudioPortConfig[] sources = patch.sources();
		if ((sources != null) && (sources.length > 0)) {
		// not supporting multiple sources, so just look at the first source
		final int devId = sources[0].port().id();
		final AudioDeviceInfo[] devices =
		AudioManager.getDevicesStatic(AudioManager.GET_DEVICES_INPUTS);
		for (int j = 0; j < devices.length; j++) {
		if (devices[j].getId() == devId) {
		return devices[j];
		}
		}
		int devId = sources[0].port().id();
		return AudioManager.getDeviceForPortId(devId, AudioManager.GET_DEVICES_INPUTS);
		}
		// patch handle is unique, there won't be another with the same handle
		break;

media/java/android/media/AudioTrack.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -3493,14 +3493,7 @@ public class AudioTrack extends PlayerBase
		if (deviceId == 0) {
		return null;
		}
		AudioDeviceInfo[] devices =
		AudioManager.getDevicesStatic(AudioManager.GET_DEVICES_OUTPUTS);
		for (int i = 0; i < devices.length; i++) {
		if (devices[i].getId() == deviceId) {
		return devices[i];
		}
		}
		return null;
		return AudioManager.getDeviceForPortId(deviceId, AudioManager.GET_DEVICES_OUTPUTS);
		}

		private void tryToDisableNativeRoutingCallback() {

media/java/android/media/MediaPlayer.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -1484,14 +1484,7 @@ public class MediaPlayer extends PlayerBase
		if (deviceId == 0) {
		return null;
		}
		AudioDeviceInfo[] devices =
		AudioManager.getDevicesStatic(AudioManager.GET_DEVICES_OUTPUTS);
		for (int i = 0; i < devices.length; i++) {
		if (devices[i].getId() == deviceId) {
		return devices[i];
		}
		}
		return null;
		return AudioManager.getDeviceForPortId(deviceId, AudioManager.GET_DEVICES_OUTPUTS);
		}