Removes automatic setting of COMM mode in WebRTC

webrtc/modules/audio_device/android/audio_manager.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 #define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
 
 namespace webrtc {
 
 // AudioManager::JavaAudioManager implementation
 AudioManager::JavaAudioManager::JavaAudioManager(
     NativeRegistration* native_reg, rtc::scoped_ptr<GlobalRef> audio_manager)
     : audio_manager_(audio_manager.Pass()),
       init_(native_reg->GetMethodId("init", "()Z")),
       dispose_(native_reg->GetMethodId("dispose", "()V")),
-      set_communication_mode_(
-          native_reg->GetMethodId("setCommunicationMode", "(Z)V")) {
+      is_communication_mode_enabled_(
+          native_reg->GetMethodId("isCommunicationModeEnabled", "()Z")) {
   ALOGD("JavaAudioManager::ctor%s", GetThreadInfo().c_str());
 }
 
 AudioManager::JavaAudioManager::~JavaAudioManager() {
   ALOGD("JavaAudioManager::dtor%s", GetThreadInfo().c_str());
 }
 
 bool AudioManager::JavaAudioManager::Init() {
   return audio_manager_->CallBooleanMethod(init_);
 }
 
 void AudioManager::JavaAudioManager::Close() {
   audio_manager_->CallVoidMethod(dispose_);
 }
 
-void AudioManager::JavaAudioManager::SetCommunicationMode(bool enable) {
-  audio_manager_->CallVoidMethod(set_communication_mode_,
-                                 static_cast<jboolean>(enable));
+bool AudioManager::JavaAudioManager::IsCommunicationModeEnabled() {
+  return audio_manager_->CallBooleanMethod(is_communication_mode_enabled_);
 }
 
 // AudioManager implementation
 AudioManager::AudioManager()
     : j_environment_(JVM::GetInstance()->environment()),
       audio_layer_(AudioDeviceModule::kPlatformDefaultAudio),
       initialized_(false),
       hardware_aec_(false),
       low_latency_playout_(false),
       delay_estimate_in_milliseconds_(0) {
@@ skipping 53 matching lines @@
 bool AudioManager::Close() {
   ALOGD("Close%s", GetThreadInfo().c_str());
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!initialized_)
     return true;
   j_audio_manager_->Close();
   initialized_ = false;
   return true;
 }
 
-void AudioManager::SetCommunicationMode(bool enable) {
-  ALOGD("SetCommunicationMode(%d)%s", enable, GetThreadInfo().c_str());
+bool AudioManager::IsCommunicationModeEnabled() const {
+  ALOGD("IsCommunicationModeEnabled()");
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(initialized_);
-  j_audio_manager_->SetCommunicationMode(enable);
+  return j_audio_manager_->IsCommunicationModeEnabled();
 }
 
 bool AudioManager::IsAcousticEchoCancelerSupported() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return hardware_aec_;
 }
 
 bool AudioManager::IsLowLatencyPlayoutSupported() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   ALOGD("IsLowLatencyPlayoutSupported()");
@@ skipping 51 matching lines @@
   return playout_parameters_;
 }
 
 const AudioParameters& AudioManager::GetRecordAudioParameters() {
   CHECK(record_parameters_.is_valid());
   DCHECK(thread_checker_.CalledOnValidThread());
   return record_parameters_;
 }
 
 }  // namespace webrtc