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

Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-12 17:05:12 +00:00
committed by Android (Google) Code Review
parent c11cb1b151 a26a76230f
commit ccaba49ab5
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4816,7 +4816,10 @@ public class AudioManager {
filterTypes.add(AudioDeviceInfo.TYPE_TELEPHONY); filterTypes.add(AudioDeviceInfo.TYPE_TELEPHONY);
if (status != AudioManager.SUCCESS) { if (status != AudioManager.SUCCESS) {
// fail and populate microphones with unknown characteristics by device information. // fail and populate microphones with unknown characteristics by device information.
if (status != AudioManager.ERROR_INVALID_OPERATION) {
Log.e(TAG, "getMicrophones failed:" + status); Log.e(TAG, "getMicrophones failed:" + status);
}
Log.i(TAG, "fallback on device info");
addMicrophonesFromAudioDeviceInfo(microphones, filterTypes); addMicrophonesFromAudioDeviceInfo(microphones, filterTypes);
return microphones; return microphones;
} }

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

@@ -1627,8 +1627,11 @@ public class AudioRecord implements AudioRouting
ArrayList<MicrophoneInfo> activeMicrophones = new ArrayList<>(); ArrayList<MicrophoneInfo> activeMicrophones = new ArrayList<>();
int status = native_get_active_microphones(activeMicrophones); int status = native_get_active_microphones(activeMicrophones);
if (status != AudioManager.SUCCESS) { if (status != AudioManager.SUCCESS) {
if (status != AudioManager.ERROR_INVALID_OPERATION) {
Log.e(TAG, "getActiveMicrophones failed:" + status); Log.e(TAG, "getActiveMicrophones failed:" + status);
} }
Log.i(TAG, "getActiveMicrophones failed, fallback on routed device info");
}
AudioManager.setPortIdForMicrophones(activeMicrophones); AudioManager.setPortIdForMicrophones(activeMicrophones);
// Use routed device when there is not information returned by hal. // Use routed device when there is not information returned by hal.

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

@@ -1433,8 +1433,11 @@ public class MediaRecorder implements AudioRouting
ArrayList<MicrophoneInfo> activeMicrophones = new ArrayList<>(); ArrayList<MicrophoneInfo> activeMicrophones = new ArrayList<>();
int status = native_getActiveMicrophones(activeMicrophones); int status = native_getActiveMicrophones(activeMicrophones);
if (status != AudioManager.SUCCESS) { if (status != AudioManager.SUCCESS) {
if (status != AudioManager.ERROR_INVALID_OPERATION) {
Log.e(TAG, "getActiveMicrophones failed:" + status); Log.e(TAG, "getActiveMicrophones failed:" + status);
} }
Log.i(TAG, "getActiveMicrophones failed, fallback on routed device info");
}
AudioManager.setPortIdForMicrophones(activeMicrophones); AudioManager.setPortIdForMicrophones(activeMicrophones);
// Use routed device when there is not information returned by hal. // Use routed device when there is not information returned by hal.