Merge "Simplify removing a bond" (4b3a2e1e) · Commits · e / os / android_packages_apps_Bluetooth

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

+10 −14

Original line number	Diff line number	Diff line
		@@ -1440,7 +1440,16 @@ public class AdapterService extends Service {

		enforceBluetoothAdminPermission(service);

		return service.removeBond(device);
		DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);
		if (deviceProp == null \|\| deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {
		return false;
		}
		deviceProp.setBondingInitiatedLocally(false);

		Message msg = service.mBondStateMachine.obtainMessage(BondStateMachine.REMOVE_BOND);
		msg.obj = device;
		service.mBondStateMachine.sendMessage(msg);
		return true;
		}

		@Override
		@@ -2074,19 +2083,6 @@ public class AdapterService extends Service {
		mBondStateMachine.sendMessage(msg);
		}

		boolean removeBond(BluetoothDevice device) {
		DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);
		if (deviceProp == null \|\| deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {
		return false;
		}
		deviceProp.setBondingInitiatedLocally(false);

		Message msg = mBondStateMachine.obtainMessage(BondStateMachine.REMOVE_BOND);
		msg.obj = device;
		mBondStateMachine.sendMessage(msg);
		return true;
		}

		/**
		* Get the bond state of a particular {@link BluetoothDevice}
		*