Revert of Android audio playout now supports non-call media streams

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 17 matching lines @@
 
 namespace webrtc {
 
 // AudioManager::JavaAudioManager implementation
 AudioManager::JavaAudioManager::JavaAudioManager(
     NativeRegistration* native_reg,
     std::unique_ptr<GlobalRef> audio_manager)
     : audio_manager_(std::move(audio_manager)),
       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")),
       is_device_blacklisted_for_open_sles_usage_(
           native_reg->GetMethodId("isDeviceBlacklistedForOpenSLESUsage",
                                   "()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_);
 }
 
 bool AudioManager::JavaAudioManager::IsDeviceBlacklistedForOpenSLESUsage() {
   return audio_manager_->CallBooleanMethod(
       is_device_blacklisted_for_open_sles_usage_);
 }
 
 // AudioManager implementation
@@ skipping 101 matching lines @@
 bool AudioManager::Close() {
   ALOGD("Close%s", GetThreadInfo().c_str());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   if (!initialized_)
     return true;
   j_audio_manager_->Close();
   initialized_ = false;
   return true;
 }
 
-void AudioManager::SetCommunicationMode(bool enable) {
-  ALOGD("SetCommunicationMode(%d)", enable);
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  j_audio_manager_->SetCommunicationMode(enable);
-}
-
 bool AudioManager::IsCommunicationModeEnabled() const {
   ALOGD("IsCommunicationModeEnabled()");
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   return j_audio_manager_->IsCommunicationModeEnabled();
 }
 
 bool AudioManager::IsAcousticEchoCancelerSupported() const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   return hardware_aec_;
 }
@@ skipping 99 matching lines @@
   return playout_parameters_;
 }
 
 const AudioParameters& AudioManager::GetRecordAudioParameters() {
   RTC_CHECK(record_parameters_.is_valid());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   return record_parameters_;
 }
 
 }  // namespace webrtc