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

Commit 6d5da5e7 authored by Stanley Tng's avatar Stanley Tng Committed by Andre Eisenbach
Browse files

Allow the Bluetooth MAC address to be updated asynchronously (1/3) 

There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.

Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382

Change-Id: I6b71100c2c03c6f365f0dbc27d4e37c734145e30
parent 909aec93

src/com/android/bluetooth/btservice/AdapterProperties.java

+7 −1
Original line number Diff line number Diff line
@@ -571,7 +571,13 @@ class AdapterProperties { 
                        break;

                    case AbstractionLayer.BT_PROPERTY_BDADDR:

                        mAddress = val;

                        debugLog("Address is:" + Utils.getAddressStringFromByte(mAddress));

                        String address = Utils.getAddressStringFromByte(mAddress);

                        debugLog("Address is:" + address);

                        intent = new Intent(BluetoothAdapter.ACTION_BLUETOOTH_ADDRESS_CHANGED);

                        intent.putExtra(BluetoothAdapter.EXTRA_BLUETOOTH_ADDRESS, address);

                        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

                        mService.sendBroadcastAsUser(

                                intent, UserHandle.ALL, mService.BLUETOOTH_PERM);

                        break;

                    case AbstractionLayer.BT_PROPERTY_CLASS_OF_DEVICE:

                        mBluetoothClass = Utils.byteArrayToInt(val, 0);