Merge "BT: Synchronize Bond SM message processing and cleanup" (192d330c) · Commits · e / os / android_packages_modules_Bluetooth

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@ final class BondStateMachine extends StateMachine {
	return bsm;		return bsm;
	}		}

	public void doQuit() {		public synchronized void doQuit() {
	quitNow();		quitNow();
	}		}

	@@ -122,7 +122,7 @@ final class BondStateMachine extends StateMachine {
	}		}

	@Override		@Override
	public boolean processMessage(Message msg) {		public synchronized boolean processMessage(Message msg) {

	BluetoothDevice dev = (BluetoothDevice) msg.obj;		BluetoothDevice dev = (BluetoothDevice) msg.obj;

	@@ -178,7 +178,7 @@ final class BondStateMachine extends StateMachine {
	}		}

	@Override		@Override
	public boolean processMessage(Message msg) {		public synchronized boolean processMessage(Message msg) {
	BluetoothDevice dev = (BluetoothDevice) msg.obj;		BluetoothDevice dev = (BluetoothDevice) msg.obj;
	DeviceProperties devProp = mRemoteDevices.getDeviceProperties(dev);		DeviceProperties devProp = mRemoteDevices.getDeviceProperties(dev);
	boolean result = false;		boolean result = false;