Merge "stack::btm::rnr: BTM_CancelRemoteDeviceName Fail early" into main (155f306d) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_inq.cc

+21 −20

Original line number	Diff line number	Diff line
		@@ -859,7 +859,10 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void) {
		bool is_le;

		/* Make sure there is not already one in progress */
		if (btm_cb.btm_inq_vars.remname_active) {
		if (!btm_cb.btm_inq_vars.remname_active) {
		return (BTM_WRONG_MODE);
		}

		if (com::android::bluetooth::flags::rnr_store_device_type()) {
		is_le = (btm_cb.btm_inq_vars.remname_dev_type == BT_DEVICE_TYPE_BLE);
		} else {
		@@ -879,8 +882,6 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void) {
		}
		}
		return (BTM_CMD_STARTED);
		} else
		return (BTM_WRONG_MODE);
		}

		/*******************************************************************************