Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebf36ac1 authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by android-build-merger
Browse files

Merge "A2DP sink audio focus" am: 3d34c439 

am: 98aa9400

Change-Id: I751d9b9832383eb2671c5a406ac4e49ddbed0eb1
parents 377e0679 98aa9400

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java

+17 −2
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.bluetooth.a2dpsink; 
import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.content.Context;

import android.media.AudioAttributes;

import android.media.AudioAttributes;

import android.media.AudioFocusRequest;

import android.media.AudioManager;

import android.media.AudioManager;

import android.media.AudioManager.OnAudioFocusChangeListener;

import android.media.AudioManager.OnAudioFocusChangeListener;

import android.os.Handler;

import android.os.Handler;
@@ -212,8 +213,22 @@ public class A2dpSinkStreamHandler extends Handler { 
     * Utility functions.

     * Utility functions.

     */

     */

    private int requestAudioFocus() {

    private int requestAudioFocus() {

        int focusRequestStatus = mAudioManager.requestAudioFocus(

        // Bluetooth A2DP may carry Music, Audio Books, Navigation, or other sounds so mark content

                mAudioFocusListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);

        // type unknown.

        AudioAttributes streamAttributes =

                new AudioAttributes.Builder()

                        .setUsage(AudioAttributes.USAGE_MEDIA)

                        .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)

                        .build();

        // Bluetooth ducking is handled at the native layer so tell the Audio Manger to notify the

        // focus change listener via .setWillPauseWhenDucked().

        AudioFocusRequest focusRequest =

                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)

                        .setAudioAttributes(streamAttributes)

                        .setWillPauseWhenDucked(true)

                        .setOnAudioFocusChangeListener(mAudioFocusListener, this)

                        .build();

        int focusRequestStatus = mAudioManager.requestAudioFocus(focusRequest);

        // If the request is granted begin streaming immediately and schedule an upgrade.

        // If the request is granted begin streaming immediately and schedule an upgrade.

        if (focusRequestStatus == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {

        if (focusRequestStatus == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {

            startAvrcpUpdates();

            startAvrcpUpdates();