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

Commit 9976fdff authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "Remove usages of HFP Client audio state APIs" into tm-dev am: 28cb4aaf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035305

Change-Id: Ie436f6afe58b18741b0e6cf8998eb702a28d7660
parents bd995a08 28cb4aaf

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+3 −5
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import android.bluetooth.BluetoothDevice; 
import android.bluetooth.BluetoothHeadset;

import android.bluetooth.BluetoothHeadsetClient;

import android.bluetooth.BluetoothHearingAid;

import android.bluetooth.BluetoothLeAudio;

import android.bluetooth.BluetoothHidDevice;

import android.bluetooth.BluetoothHidHost;

import android.bluetooth.BluetoothLeAudio;

import android.bluetooth.BluetoothMap;

import android.bluetooth.BluetoothMapClient;

import android.bluetooth.BluetoothPan;
@@ -159,10 +159,8 @@ public class LocalBluetoothProfileManager { 
        if (mHfpClientProfile == null && supportedList.contains(BluetoothProfile.HEADSET_CLIENT)) {

            if (DEBUG) Log.d(TAG, "Adding local HfpClient profile");

            mHfpClientProfile = new HfpClientProfile(mContext, mDeviceManager, this);

            addHeadsetProfile(mHfpClientProfile, HfpClientProfile.NAME,

                    BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED,

                    BluetoothHeadsetClient.ACTION_AUDIO_STATE_CHANGED,

                    BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED);

            addProfile(mHfpClientProfile, HfpClientProfile.NAME,

                    BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (mMapClientProfile == null && supportedList.contains(BluetoothProfile.MAP_CLIENT)) {

            if (DEBUG) Log.d(TAG, "Adding local MAP CLIENT profile");