From a21090b7706eb6577f4b305f3e00b04fe833c50d Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Thu, 29 Mar 2018 12:31:15 +0200 Subject: [PATCH] Android: Remove IsCommunicationModeEnabled() from AudioManager This method is only used for logging and is blocking further refactoring work. Once the refactoring and cleanup of the external AudioDeviceModule is complete, we can revisit what logging we want and need and add it in a cleaner way. Bug: webrtc:7452 Change-Id: If08bcfb37860e9e7b9b5105cb75f748b53775f69 Reviewed-on: https://webrtc-review.googlesource.com/65460 Commit-Queue: Magnus Jedvert Reviewed-by: Paulina Hensman Cr-Commit-Position: refs/heads/master@{#22678} --- .../src/java/org/webrtc/audio/WebRtcAudioManager.java | 5 ----- sdk/android/src/jni/audio_device/audio_device_module.cc | 8 -------- sdk/android/src/jni/audio_device/audio_manager.cc | 7 ------- sdk/android/src/jni/audio_device/audio_manager.h | 3 --- 4 files changed, 23 deletions(-) diff --git a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioManager.java b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioManager.java index 62b32abd0d..f07fd5f421 100644 --- a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioManager.java +++ b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioManager.java @@ -128,11 +128,6 @@ class WebRtcAudioManager { volumeLogger.stop(); } - @CalledByNative - private boolean isCommunicationModeEnabled() { - return (audioManager.getMode() == AudioManager.MODE_IN_COMMUNICATION); - } - // Returns true if low-latency audio output is supported. public static boolean isLowLatencyOutputSupported(Context context) { return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_LOW_LATENCY); diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc index e57d7c64c1..c05393f50c 100644 --- a/sdk/android/src/jni/audio_device/audio_device_module.cc +++ b/sdk/android/src/jni/audio_device/audio_device_module.cc @@ -252,10 +252,6 @@ class AndroidAudioDeviceModule : public AudioDeviceModule { return 0; } audio_device_buffer_->StartPlayout(); - if (!audio_manager_->IsCommunicationModeEnabled()) { - RTC_LOG(WARNING) - << "The application should use MODE_IN_COMMUNICATION audio mode!"; - } int32_t result = output_->StartPlayout(); RTC_LOG(INFO) << "output: " << result; RTC_HISTOGRAM_BOOLEAN("WebRTC.Audio.StartPlayoutSuccess", @@ -290,10 +286,6 @@ class AndroidAudioDeviceModule : public AudioDeviceModule { if (Recording()) { return 0; } - if (!audio_manager_->IsCommunicationModeEnabled()) { - RTC_LOG(WARNING) - << "The application should use MODE_IN_COMMUNICATION audio mode!"; - } audio_device_buffer_->StartRecording(); int32_t result = input_->StartRecording(); RTC_LOG(INFO) << "output: " << result; diff --git a/sdk/android/src/jni/audio_device/audio_manager.cc b/sdk/android/src/jni/audio_device/audio_manager.cc index 39f83e38a6..98c51d584b 100644 --- a/sdk/android/src/jni/audio_device/audio_manager.cc +++ b/sdk/android/src/jni/audio_device/audio_manager.cc @@ -98,13 +98,6 @@ bool AudioManager::Close() { return true; } -bool AudioManager::IsCommunicationModeEnabled() const { - RTC_DCHECK(thread_checker_.CalledOnValidThread()); - JNIEnv* env = AttachCurrentThreadIfNeeded(); - return Java_WebRtcAudioManager_isCommunicationModeEnabled(env, - j_audio_manager_); -} - bool AudioManager::IsAcousticEchoCancelerSupported() const { RTC_DCHECK(thread_checker_.CalledOnValidThread()); JNIEnv* env = AttachCurrentThreadIfNeeded(); diff --git a/sdk/android/src/jni/audio_device/audio_manager.h b/sdk/android/src/jni/audio_device/audio_manager.h index c826402271..eebaa72c31 100644 --- a/sdk/android/src/jni/audio_device/audio_manager.h +++ b/sdk/android/src/jni/audio_device/audio_manager.h @@ -43,9 +43,6 @@ class AudioManager { // Revert any setting done by Init(). bool Close(); - // Returns true if current audio mode is AudioManager.MODE_IN_COMMUNICATION. - bool IsCommunicationModeEnabled() const; - // Native audio parameters stored during construction. const AudioParameters& GetPlayoutAudioParameters(); const AudioParameters& GetRecordAudioParameters();