Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix mic enumeration CTS fail on marlin." into pi-dev

Browse Source 
am: 0b5dd8e560

Change-Id: I681eb47ec1577ad6c2b35d0e739c249bf61f0f26
This commit is contained in:
jiabin
2018-04-11 09:00:10 -07:00
committed by android-build-merger
parent 01f36332ef 0b5dd8e560
commit 76e69b0812
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
media/java/android/media/AudioManager.java
View File

@@ -63,6 +63,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -4785,6 +4786,21 @@ public class AudioManager {
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
* 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 {
ArrayList<MicrophoneInfo> microphones = new ArrayList<MicrophoneInfo>();
int status = AudioSystem.getMicrophones(microphones);
HashSet<Integer> filterTypes = new HashSet<>();
filterTypes.add(AudioDeviceInfo.TYPE_TELEPHONY);
if (status != AudioManager.SUCCESS) {
// fail and bail!
// fail and populate microphones with unknown characteristics by device information.
Log.e(TAG, "getMicrophones failed:" + status);
return new ArrayList<MicrophoneInfo>(); // Always return a list.
addMicrophonesFromAudioDeviceInfo(microphones, filterTypes);
return microphones;
}
setPortIdForMicrophones(microphones);
AudioDeviceInfo[] devices = getDevicesStatic(GET_DEVICES_INPUTS);
for (AudioDeviceInfo device : devices) {
if (device.getType() == AudioDeviceInfo.TYPE_BUILTIN_MIC ||
device.getType() == AudioDeviceInfo.TYPE_TELEPHONY) {
continue;
}
MicrophoneInfo microphone = microphoneInfoFromAudioDeviceInfo(device);
microphones.add(microphone);
}
filterTypes.add(AudioDeviceInfo.TYPE_BUILTIN_MIC);
addMicrophonesFromAudioDeviceInfo(microphones, filterTypes);
return microphones;
}

1
media/java/android/media/AudioRecord.java
View File

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

1
media/java/android/media/MediaRecorder.java
View File

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