media/audio/android/audio_manager_android.h - Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: missed one comment and addressed Ami's comment 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

« no previous file with comments | « content/shell/android/shell_apk/AndroidManifest.xml ('k') | media/audio/android/audio_manager_android.cc » ('j') | media/audio/android/audio_manager_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/audio/android/audio_manager_android.h

===================================================================

--- media/audio/android/audio_manager_android.h (revision 187380)

+++ 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 {

@@ -32,11 +33,14 @@

virtual AudioInputStream* MakeLowLatencyInputStream(

const AudioParameters& params, const std::string& device_id) OVERRIDE;

+ static bool RegisterAudioManager(JNIEnv* env);

protected:

virtual ~AudioManagerAndroid();

virtual AudioParameters GetPreferredOutputStreamParameters(

const AudioParameters& input_params) OVERRIDE;

+ void SetAudioMode(int mode);

private:

DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);