Merge "Fix mic enumeration CTS fail on marlin." into pi-dev (0b5dd8e5) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+23 −11

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,7 @@ import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.HashMap;		import java.util.HashMap;
			import java.util.HashSet;
	import java.util.Iterator;		import java.util.Iterator;
	import java.util.List;		import java.util.List;
	import java.util.concurrent.ConcurrentHashMap;		import java.util.concurrent.ConcurrentHashMap;
	@@ -4785,6 +4786,21 @@ public class AudioManager {
	return microphone;		return microphone;
	}		}

			/**
			* Add {@link MicrophoneInfo} by device information while filtering certain types.
			*/
			private void addMicrophonesFromAudioDeviceInfo(ArrayList<MicrophoneInfo> microphones,
			HashSet<Integer> filterTypes) {
			AudioDeviceInfo[] devices = getDevicesStatic(GET_DEVICES_INPUTS);
			for (AudioDeviceInfo device : devices) {
			if (filterTypes.contains(device.getType())) {
			continue;
			}
			MicrophoneInfo microphone = microphoneInfoFromAudioDeviceInfo(device);
			microphones.add(microphone);
			}
			}

	/**		/**
	* Returns a list of {@link MicrophoneInfo} that corresponds to the characteristics		* Returns a list of {@link MicrophoneInfo} that corresponds to the characteristics
	* of all available microphones. The list is empty when no microphones are available		* of all available microphones. The list is empty when no microphones are available
	@@ -4796,21 +4812,17 @@ public class AudioManager {
	public List<MicrophoneInfo> getMicrophones() throws IOException {		public List<MicrophoneInfo> getMicrophones() throws IOException {
	ArrayList<MicrophoneInfo> microphones = new ArrayList<MicrophoneInfo>();		ArrayList<MicrophoneInfo> microphones = new ArrayList<MicrophoneInfo>();
	int status = AudioSystem.getMicrophones(microphones);		int status = AudioSystem.getMicrophones(microphones);
			HashSet<Integer> filterTypes = new HashSet<>();
			filterTypes.add(AudioDeviceInfo.TYPE_TELEPHONY);
	if (status != AudioManager.SUCCESS) {		if (status != AudioManager.SUCCESS) {
	// fail and bail!		// fail and populate microphones with unknown characteristics by device information.
	Log.e(TAG, "getMicrophones failed:" + status);		Log.e(TAG, "getMicrophones failed:" + status);
	return new ArrayList<MicrophoneInfo>(); // Always return a list.		addMicrophonesFromAudioDeviceInfo(microphones, filterTypes);
			return microphones;
	}		}
	setPortIdForMicrophones(microphones);		setPortIdForMicrophones(microphones);
	AudioDeviceInfo[] devices = getDevicesStatic(GET_DEVICES_INPUTS);		filterTypes.add(AudioDeviceInfo.TYPE_BUILTIN_MIC);
	for (AudioDeviceInfo device : devices) {		addMicrophonesFromAudioDeviceInfo(microphones, filterTypes);
	if (device.getType() == AudioDeviceInfo.TYPE_BUILTIN_MIC \|\|
	device.getType() == AudioDeviceInfo.TYPE_TELEPHONY) {
	continue;
	}
	MicrophoneInfo microphone = microphoneInfoFromAudioDeviceInfo(device);
	microphones.add(microphone);
	}
	return microphones;		return microphones;
	}		}

media/java/android/media/AudioRecord.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1628,7 +1628,6 @@ public class AudioRecord implements AudioRouting
	int status = native_get_active_microphones(activeMicrophones);		int status = native_get_active_microphones(activeMicrophones);
	if (status != AudioManager.SUCCESS) {		if (status != AudioManager.SUCCESS) {
	Log.e(TAG, "getActiveMicrophones failed:" + status);		Log.e(TAG, "getActiveMicrophones failed:" + status);
	return new ArrayList<MicrophoneInfo>();
	}		}
	AudioManager.setPortIdForMicrophones(activeMicrophones);		AudioManager.setPortIdForMicrophones(activeMicrophones);

media/java/android/media/MediaRecorder.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1434,7 +1434,6 @@ public class MediaRecorder implements AudioRouting
	int status = native_getActiveMicrophones(activeMicrophones);		int status = native_getActiveMicrophones(activeMicrophones);
	if (status != AudioManager.SUCCESS) {		if (status != AudioManager.SUCCESS) {
	Log.e(TAG, "getActiveMicrophones failed:" + status);		Log.e(TAG, "getActiveMicrophones failed:" + status);
	return new ArrayList<MicrophoneInfo>();
	}		}
	AudioManager.setPortIdForMicrophones(activeMicrophones);		AudioManager.setPortIdForMicrophones(activeMicrophones);