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

Unified Diff: media/base/android/java/src/org/chromium/media/MediaPlayerListener.java

Issue 1110833004: Move audio focus control from media/ to content/ and make it per WebContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/test/data/android/media/video-6seconds.mp4 ('k') | media/base/android/media_player_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
index 47bd01aac1a9252b9481d9ce960c671c517e0414..78723b7c38091659314e4f315cc480fd9a12af75 100644
--- a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
+++ b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
@@ -5,7 +5,6 @@
package org.chromium.media;
import android.content.Context;
-import android.media.AudioManager;
import android.media.MediaPlayer;
import org.chromium.base.CalledByNative;
@@ -19,8 +18,7 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener,
MediaPlayer.OnBufferingUpdateListener,
MediaPlayer.OnSeekCompleteListener,
MediaPlayer.OnVideoSizeChangedListener,
- MediaPlayer.OnErrorListener,
- AudioManager.OnAudioFocusChangeListener {
+ MediaPlayer.OnErrorListener {
// These values are mirrored as enums in media/base/android/media_player_bridge.h.
// Please ensure they stay in sync.
private static final int MEDIA_ERROR_FORMAT = 0;
@@ -101,25 +99,6 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener,
nativeOnMediaPrepared(mNativeMediaPlayerListener);
}
- @Override
- public void onAudioFocusChange(int focusChange) {
- if (focusChange == AudioManager.AUDIOFOCUS_LOSS
- || focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT) {
- nativeOnMediaInterrupted(mNativeMediaPlayerListener);
- }
- }
-
- @CalledByNative
- public void releaseResources() {
- if (mContext != null) {
- // Unregister the wish for audio focus.
- AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
- if (am != null) {
- am.abandonAudioFocus(this);
- }
- }
- }
-
@CalledByNative
private static MediaPlayerListener create(long nativeMediaPlayerListener,
Context context, MediaPlayerBridge mediaPlayerBridge) {
@@ -133,14 +112,6 @@ class MediaPlayerListener implements MediaPlayer.OnPreparedListener,
mediaPlayerBridge.setOnSeekCompleteListener(listener);
mediaPlayerBridge.setOnVideoSizeChangedListener(listener);
}
-
- AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
- am.requestAudioFocus(
- listener,
- AudioManager.STREAM_MUSIC,
-
- // Request permanent focus.
- AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
return listener;
}
« no previous file with comments | « content/test/data/android/media/video-6seconds.mp4 ('k') | media/base/android/media_player_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698