| Index: content/renderer/media/android/webmediaplayer_android.cc
|
| diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
|
| index f54fc16b4ab9ea116e89443696c2d67d28fd2dea..0e007de0f8396ae7ccaefd38bbfa4b3375d3ecc2 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.cc
|
| +++ b/content/renderer/media/android/webmediaplayer_android.cc
|
| @@ -1218,11 +1218,11 @@ void WebMediaPlayerAndroid::OnShown() {
|
| play();
|
| }
|
|
|
| -void WebMediaPlayerAndroid::OnSuspendRequested(bool must_suspend) {
|
| +bool WebMediaPlayerAndroid::OnSuspendRequested(bool must_suspend) {
|
| if (!must_suspend &&
|
| base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableMediaSuspend)) {
|
| - return;
|
| + return true;
|
| }
|
|
|
| // If we're idle or playing video, pause and release resources; audio only
|
| @@ -1231,6 +1231,8 @@ void WebMediaPlayerAndroid::OnSuspendRequested(bool must_suspend) {
|
| (hasVideo() && !IsBackgroundVideoCandidate())) {
|
| SuspendAndReleaseResources();
|
| }
|
| +
|
| + return true;
|
| }
|
|
|
| void WebMediaPlayerAndroid::OnPlay() {
|
|
|