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

Commit 3fc54163 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Add the API to get the AudioLocation" into tm-dev am: 83addbff 

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

Change-Id: I68f8011342e8cac4f1f016a1b0b8e2d72fff1ec2
parents 995ef0a3 83addbff

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

+2 −1
Original line number Diff line number Diff line
@@ -1117,7 +1117,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
                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) {

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

+7 −0
Original line number Diff line number Diff line
@@ -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) {