From a26a76230f0dc5b70f8b26e997240af2e9c17a2b Mon Sep 17 00:00:00 2001 From: jiabin Date: Wed, 11 Apr 2018 15:38:46 -0700 Subject: [PATCH] Change log level when microphone enumeration APIs native call fail. For microphone enumeration APIs, it could fail due to hal v2, which is WAI. We shouldn't log as error. Using warning instead. Bug: 64038649 Test: build Change-Id: I1a64b8537e27e712a09f122d4763e0e5a345b08f --- media/java/android/media/AudioManager.java | 5 ++++- media/java/android/media/AudioRecord.java | 5 ++++- media/java/android/media/MediaRecorder.java | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index fdb7499bfe3df..68463e11bbfe3 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -4816,7 +4816,10 @@ public class AudioManager { filterTypes.add(AudioDeviceInfo.TYPE_TELEPHONY); if (status != AudioManager.SUCCESS) { // fail and populate microphones with unknown characteristics by device information. - Log.e(TAG, "getMicrophones failed:" + status); + if (status != AudioManager.ERROR_INVALID_OPERATION) { + Log.e(TAG, "getMicrophones failed:" + status); + } + Log.i(TAG, "fallback on device info"); addMicrophonesFromAudioDeviceInfo(microphones, filterTypes); return microphones; } diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index 6b35dd4cc379e..54800ae213cdd 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -1627,7 +1627,10 @@ public class AudioRecord implements AudioRouting ArrayList activeMicrophones = new ArrayList<>(); int status = native_get_active_microphones(activeMicrophones); if (status != AudioManager.SUCCESS) { - Log.e(TAG, "getActiveMicrophones failed:" + status); + if (status != AudioManager.ERROR_INVALID_OPERATION) { + Log.e(TAG, "getActiveMicrophones failed:" + status); + } + Log.i(TAG, "getActiveMicrophones failed, fallback on routed device info"); } AudioManager.setPortIdForMicrophones(activeMicrophones); diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 82d64f300850c..b47b4cd17b5f5 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -1433,7 +1433,10 @@ public class MediaRecorder implements AudioRouting ArrayList activeMicrophones = new ArrayList<>(); int status = native_getActiveMicrophones(activeMicrophones); if (status != AudioManager.SUCCESS) { - Log.e(TAG, "getActiveMicrophones failed:" + status); + if (status != AudioManager.ERROR_INVALID_OPERATION) { + Log.e(TAG, "getActiveMicrophones failed:" + status); + } + Log.i(TAG, "getActiveMicrophones failed, fallback on routed device info"); } AudioManager.setPortIdForMicrophones(activeMicrophones);