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

webrtc/modules/audio_device/android/audio_manager.h

 /*
  *  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 29 matching lines @@
   // allows calls like JavaAudioManager::Close() while hiding the Java/JNI
   // parts that are associated with this call.
   class JavaAudioManager {
    public:
     JavaAudioManager(NativeRegistration* native_registration,
                      std::unique_ptr<GlobalRef> audio_manager);
     ~JavaAudioManager();
 
     bool Init();
     void Close();
-    void SetCommunicationMode(bool enable);
     bool IsCommunicationModeEnabled();
     bool IsDeviceBlacklistedForOpenSLESUsage();
 
    private:
     std::unique_ptr<GlobalRef> audio_manager_;
     jmethodID init_;
     jmethodID dispose_;
-    jmethodID set_communication_mode_;
     jmethodID is_communication_mode_enabled_;
     jmethodID is_device_blacklisted_for_open_sles_usage_;
   };
 
   AudioManager();
   ~AudioManager();
 
   // Sets the currently active audio layer combination. Must be called before
   // Init().
   void SetActiveAudioLayer(AudioDeviceModule::AudioLayer audio_layer);
 
   // Creates and realizes the main (global) Open SL engine object and returns
   // a reference to it. The engine object is only created at the first call
   // since OpenSL ES for Android only supports a single engine per application.
   // Subsequent calls returns the already created engine. The SL engine object
   // is destroyed when the AudioManager object is deleted. It means that the
   // engine object will be the first OpenSL ES object to be created and last
   // object to be destroyed.
   // Note that NULL will be returned unless the audio layer is specified as
   // AudioDeviceModule::kAndroidOpenSLESAudio or
   // AudioDeviceModule::kAndroidJavaInputAndOpenSLESOutputAudio.
   SLObjectItf GetOpenSLEngine();
 
   // Initializes the audio manager and stores the current audio mode.
   bool Init();
   // Revert any setting done by Init().
   bool Close();
 
-  // Set audio mode to AudioManager.MODE_IN_COMMUNICATION if |enable| is true
-  // and AudioManager.MODE_NORMAL otherwise.
-  void SetCommunicationMode(bool enable);
   // 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();
 
   // Returns true if the device supports built-in audio effects for AEC, AGC
   // and NS. Some devices can also be blacklisted for use in combination with
   // platform effects and these devices will return false.
@@ skipping 102 matching lines @@
   // Contains native parameters (e.g. sample rate, channel configuration).
   // Set at construction in OnCacheAudioParameters() which is called from
   // Java on the same thread as this object is created on.
   AudioParameters playout_parameters_;
   AudioParameters record_parameters_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_