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

Commit 00cb1d05 authored by Vic Huang's avatar Vic Huang Committed by android-build-merger
Browse files

Merge "Remove uuid when device leaves bonded state" 

am: 0e0247b5

Change-Id: I535e62f28a904d27e4d2c4776a16b0657cd07b0c
parents b79e59d4 0e0247b5

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

+5 −3
Original line number Diff line number Diff line
@@ -311,10 +311,11 @@ final class RemoteDevices { 
        /**

         * @param mBondState the mBondState to set

         */

        void setBondState(int mBondState) {

        void setBondState(int newBondState) {

            synchronized (mObject) {

                this.mBondState = mBondState;

                if (mBondState == BluetoothDevice.BOND_NONE) {

                if ((mBondState == BluetoothDevice.BOND_BONDED

                        && newBondState == BluetoothDevice.BOND_BONDING)

                        || 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.
@@ -322,6 +323,7 @@ final class RemoteDevices { 
                    mUuids = null;

                    mAlias = null;

                }

                mBondState = newBondState;

            }

        }