Merge "Remove uuid when device leaves bonded state" (0e0247b5) · Commits · e / os / android_packages_apps_Bluetooth

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

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -311,10 +311,11 @@ final class RemoteDevices {
	/**		/**
	* @param mBondState the mBondState to set		* @param mBondState the mBondState to set
	*/		*/
	void setBondState(int mBondState) {		void setBondState(int newBondState) {
	synchronized (mObject) {		synchronized (mObject) {
	this.mBondState = mBondState;		if ((mBondState == BluetoothDevice.BOND_BONDED
	if (mBondState == BluetoothDevice.BOND_NONE) {		&& newBondState == BluetoothDevice.BOND_BONDING)
			\|\| newBondState == BluetoothDevice.BOND_NONE) {
	/* Clearing the Uuids local copy when the device is unpaired. If not cleared,		/* Clearing the Uuids local copy when the device is unpaired. If not cleared,
	cachedBluetoothDevice issued a connect using the local cached copy of uuids,		cachedBluetoothDevice issued a connect using the local cached copy of uuids,
	without waiting for the ACTION_UUID intent.		without waiting for the ACTION_UUID intent.
	@@ -322,6 +323,7 @@ final class RemoteDevices {
	mUuids = null;		mUuids = null;
	mAlias = null;		mAlias = null;
	}		}
			mBondState = newBondState;
	}		}
	}		}