From b35ca2b5707da2155d2b8d7600d55f1422dedacf Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 8 Mar 2022 14:40:19 +0800 Subject: [PATCH] Add the API to get the AudioLocation 1.Add the API(getAudioLocation) to get the AudioLocation of LE audio device at LeAudioProfile. 2.Add LeAudio summary state Bug: 218626547 Test: build pass Change-Id: I3655d1771f0ee9d60f65406e83b42e40307bd4f3 Merged-In: I3655d1771f0ee9d60f65406e83b42e40307bd4f3 --- .../settingslib/bluetooth/CachedBluetoothDevice.java | 3 ++- .../com/android/settingslib/bluetooth/LeAudioProfile.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 981d8e403cd68..019e51bf0baef 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -1115,7 +1115,8 @@ public class CachedBluetoothDevice implements Comparable final boolean isOnCall = Utils.isAudioModeOngoingCall(mContext); if ((mIsActiveDeviceHearingAid) || (mIsActiveDeviceHeadset && isOnCall) - || (mIsActiveDeviceA2dp && !isOnCall)) { + || (mIsActiveDeviceA2dp && !isOnCall) + || mIsActiveDeviceLeAudio) { if (isTwsBatteryAvailable(leftBattery, rightBattery) && !shortSummary) { stringRes = R.string.bluetooth_active_battery_level_untethered; } else if (batteryLevelPercentageString != null && !shortSummary) { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java index db6d41ef692d1..c323c4ef99373 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LeAudioProfile.java @@ -246,6 +246,13 @@ public class LeAudioProfile implements LocalBluetoothProfile { return R.drawable.ic_bt_le_audio; } + public int getAudioLocation(BluetoothDevice device) { + if (mService == null || device == null) { + return BluetoothLeAudio.AUDIO_LOCATION_INVALID; + } + return mService.getAudioLocation(device); + } + @RequiresApi(Build.VERSION_CODES.S) protected void finalize() { if (DEBUG) {