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

Commit a1c54782 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8683613 from 13b03994 to tm-d1-release 

Change-Id: I374eb4f23ddf2d36181dc10aec90eb2b8a7df8ef
parents a546e506 13b03994

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -429,6 +429,7 @@ public class BluetoothDeviceManager { 
        if (mAudioManager.getCommunicationDevice() != null

        if (mAudioManager.getCommunicationDevice() != null

                && mAudioManager.getCommunicationDevice().getType()

                && mAudioManager.getCommunicationDevice().getType()

                == AudioDeviceInfo.TYPE_BLE_HEADSET) {

                == AudioDeviceInfo.TYPE_BLE_HEADSET) {

            mBluetoothRouteManager.onAudioLost(mAudioManager.getCommunicationDevice().getAddress());

            mAudioManager.clearCommunicationDevice();

            mAudioManager.clearCommunicationDevice();

            mLeAudioSetAsCommunicationDevice = false;

            mLeAudioSetAsCommunicationDevice = false;

        }

        }
@@ -493,6 +494,7 @@ public class BluetoothDeviceManager { 
            Log.w(this, " Could not set bleHeadset device");

            Log.w(this, " Could not set bleHeadset device");

        } else {

        } else {

            Log.i(this, " bleHeadset device set");

            Log.i(this, " bleHeadset device set");

            mBluetoothRouteManager.onAudioOn(bleHeadset.getAddress());

            mLeAudioSetAsCommunicationDevice = true;

            mLeAudioSetAsCommunicationDevice = true;

        }

        }

        return result;

        return result;

src/com/android/server/telecom/bluetooth/BluetoothStateReceiver.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -196,9 +196,10 @@ public class BluetoothStateReceiver extends BroadcastReceiver { 
                        Log.w(LOG_TAG,

                        Log.w(LOG_TAG,

                                "Device %s cannot be use as hearing aid communication device.",

                                "Device %s cannot be use as hearing aid communication device.",

                                device);

                                device);

                    } else {

                        mBluetoothRouteManager.sendMessage(BT_AUDIO_IS_ON, args);

                    }

                    }

                }

                }

                mBluetoothRouteManager.sendMessage(BT_AUDIO_IS_ON, args);

           }

           }

        }

        }

    }

    }