Commit a0e6608e authored by Mike Dodd's avatar Mike Dodd Committed by Commit Bot

Fix bug in Cast audio focus on Android

In 6f15f17c the audio focus
was inadvertently being adjusted the Activity, Fragment, and
Service, but we just want the Activity.

Bug: internal b/169078948
Test: verify audio works for Cast and Bluetooth content

Change-Id: Ia0e8991f82d2b44618307b67b9541f953d53f659
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431409Reviewed-by: default avatarSimeon Anfinrud <sanfin@chromium.org>
Commit-Queue: Mike Dodd <mdodd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811345}
parent 782822fa
......@@ -137,6 +137,15 @@ public class CastWebContentsComponent {
context, webContents, enableTouch, isRemoteControlMode, turnOnScreen, mSessionId);
if (DEBUG) Log.d(TAG, "start activity by intent: " + intent);
ResumeIntents.addResumeIntent(mSessionId, intent);
CastAudioManager audioManager =
CastAudioManager.getAudioManager(ContextUtils.getApplicationContext());
Observable<CastAudioManager.AudioFocusLoss> focusLoss =
audioManager.requestAudioFocusWhen(mAudioFocusRequestState)
.filter(state -> state == CastAudioManager.AudioFocusLoss.NORMAL);
mAudioFocusRequestState.andThen(focusLoss).subscribe(
Observers.onEnter(x -> mComponentClosedHandler.onComponentClosed()));
context.startActivity(intent);
}
......@@ -209,13 +218,6 @@ public class CastWebContentsComponent {
mSurfaceEventHandler = surfaceEventHandler;
mIsRemoteControlMode = isRemoteControlMode;
mTurnOnScreen = turnOnScreen;
CastAudioManager audioManager =
CastAudioManager.getAudioManager(ContextUtils.getApplicationContext());
Observable<CastAudioManager.AudioFocusLoss> focusLoss =
audioManager.requestAudioFocusWhen(mAudioFocusRequestState)
.filter(state -> state == CastAudioManager.AudioFocusLoss.NORMAL);
mAudioFocusRequestState.andThen(focusLoss).subscribe(
Observers.onEnter(x -> mComponentClosedHandler.onComponentClosed()));
if (BuildConfig.DISPLAY_WEB_CONTENTS_IN_SERVICE || isHeadless) {
if (DEBUG) Log.d(TAG, "Creating service delegate...");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment