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

Commit 2305dc8a authored by Chris Manton's avatar Chris Manton
Browse files

Revert "Remove uuid when device leaves bonded state" 

This reverts commit f7aa659bc7a3d9d89e54d9e154876a054c5bc269.

Bug: 274817023
Test: Verified fixed on Android Auto Audi

Reason for revert: Breaks devices with sensitive SDP/SMP timing conditions

Change-Id: I67501425358fdb85b9cd567d2dd5edf0141179d8
parent 18c2864e

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+2 −4
Original line number Diff line number Diff line
@@ -553,9 +553,8 @@ final class RemoteDevices { 
         */

        void setBondState(int newBondState) {

            synchronized (mObject) {

                if ((mBondState == BluetoothDevice.BOND_BONDED

                        && newBondState == BluetoothDevice.BOND_BONDING)

                        || newBondState == BluetoothDevice.BOND_NONE) {

                this.mBondState = newBondState;

                if (newBondState == BluetoothDevice.BOND_NONE) {

                    /* Clearing the Uuids local copy when the device is unpaired. If not cleared,

                    cachedBluetoothDevice issued a connect using the local cached copy of uuids,

                    without waiting for the ACTION_UUID intent.
@@ -563,7 +562,6 @@ final class RemoteDevices { 
                    mUuids = null;

                    mAlias = null;

                }

                mBondState = newBondState;

            }

        }