Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: media/audio/android/audio_manager_android.h

Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: change header order Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/audio/android/audio_manager_android.h
===================================================================
--- media/audio/android/audio_manager_android.h (revision 187192)
+++ media/audio/android/audio_manager_android.h (working copy)
@@ -5,6 +5,7 @@
#ifndef MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
#define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
+#include "base/android/jni_android.h"
#include "media/audio/audio_manager_base.h"
namespace media {
@@ -12,6 +13,11 @@
// Android implemention of AudioManager.
class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
public:
+ static const int kAudioModeNormal = 0x00000000;
+ static const int kAudioModeRingtone = 0x00000001;
+ static const int kAudioModeInCall = 0x00000002;
+ static const int kAudioModeInCommunication = 0x00000003;
+
AudioManagerAndroid();
// Implementation of AudioManager.
@@ -31,12 +37,14 @@
const AudioParameters& params, const std::string& device_id) OVERRIDE;
virtual AudioInputStream* MakeLowLatencyInputStream(
const AudioParameters& params, const std::string& device_id) OVERRIDE;
+ static bool RegisterAudioManager(JNIEnv* env);
tommi (sloooow) - chröme 2013/03/11 09:57:18 Add whitespace to separate this method from the vi
leozwang1 2013/03/11 15:12:24 Done. Yes, it must be public which is called by me
protected:
virtual ~AudioManagerAndroid();
virtual AudioParameters GetPreferredOutputStreamParameters(
tommi (sloooow) - chröme 2013/03/11 09:57:18 why is this method here and not with the other met
leozwang1 2013/03/11 15:12:24 Tommi, can you please explain more? where shall I
no longer working on chromium 2013/03/11 16:07:54 You meant GetPreferredOutputStreamParameters and G
const AudioParameters& input_params) OVERRIDE;
+ void SetAudioMode(int mode);
private:
DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);

Powered by Google App Engine
This is Rietveld 408576698