Merge "system/btif/src: Update BT_STATUS_FAIL with more descriptive metrics" into main (c912ae80) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/bluetooth.cc

+5 −3

Original line number	Diff line number	Diff line
		@@ -540,7 +540,7 @@ static int set_adapter_property(const bt_property_t* property) {
		case BT_PROPERTY_CLASS_OF_DEVICE:
		break;
		default:
		return BT_STATUS_FAIL;
		return BT_STATUS_UNHANDLED;
		}

		do_in_main_thread(FROM_HERE, base::BindOnce(
		@@ -680,7 +680,9 @@ static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,
		bt_pin_code_t* pin_code) {
		bt_pin_code_t tmp_pin_code;
		if (!interface_ready()) return BT_STATUS_NOT_READY;
		if (pin_code == nullptr \|\| pin_len > PIN_CODE_LEN) return BT_STATUS_FAIL;
		if (pin_code == nullptr \|\| pin_len > PIN_CODE_LEN) {
		return BT_STATUS_PARM_INVALID;
		}

		memcpy(&tmp_pin_code, pin_code, pin_len);

		@@ -692,7 +694,7 @@ static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,
		static int ssp_reply(const RawAddress* bd_addr, bt_ssp_variant_t variant,
		uint8_t accept, uint32_t /* passkey */) {
		if (!interface_ready()) return BT_STATUS_NOT_READY;
		if (variant == BT_SSP_VARIANT_PASSKEY_ENTRY) return BT_STATUS_FAIL;
		if (variant == BT_SSP_VARIANT_PASSKEY_ENTRY) return BT_STATUS_PARM_INVALID;

		do_in_main_thread(
		FROM_HERE, base::BindOnce(btif_dm_ssp_reply, *bd_addr, variant, accept));

system/btif/src/btif_gatt_server.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -398,8 +398,9 @@ static void add_service_impl(int server_if,
		if (service[0].uuid == Uuid::From16Bit(UUID_SERVCLASS_GATT_SERVER) \|\|
		service[0].uuid == Uuid::From16Bit(UUID_SERVCLASS_GAP_SERVER)) {
		log::error("Attept to register restricted service");
		HAL_CBACK(bt_gatt_callbacks, server->service_added_cb, BT_STATUS_FAIL,
		server_if, service.data(), service.size());
		HAL_CBACK(bt_gatt_callbacks, server->service_added_cb,
		BT_STATUS_AUTH_REJECTED, server_if, service.data(),
		service.size());
		return;
		}

system/btif/src/btif_hf_client.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -557,7 +557,7 @@ static bt_status_t handle_call_action(const RawAddress* bd_addr,
		case BTHF_CLIENT_CALL_ACTION_CHLD_1x:
		if (cb->peer_feat & BTA_HF_CLIENT_PEER_ECC) {
		if (idx < 1) {
		return BT_STATUS_FAIL;
		return BT_STATUS_UNHANDLED;
		}
		BTA_HfClientSendAT(cb->handle, BTA_HF_CLIENT_AT_CMD_CHLD, 1, idx, NULL);
		break;
		@@ -566,7 +566,7 @@ static bt_status_t handle_call_action(const RawAddress* bd_addr,
		case BTHF_CLIENT_CALL_ACTION_CHLD_2x:
		if (cb->peer_feat & BTA_HF_CLIENT_PEER_ECC) {
		if (idx < 1) {
		return BT_STATUS_FAIL;
		return BT_STATUS_UNHANDLED;
		}
		BTA_HfClientSendAT(cb->handle, BTA_HF_CLIENT_AT_CMD_CHLD, 2, idx, NULL);
		break;
		@@ -588,7 +588,7 @@ static bt_status_t handle_call_action(const RawAddress* bd_addr,
		BTA_HfClientSendAT(cb->handle, BTA_HF_CLIENT_AT_CMD_BTRH, 2, 0, NULL);
		break;
		default:
		return BT_STATUS_FAIL;
		return BT_STATUS_UNHANDLED;
		}

		return BT_STATUS_SUCCESS;

system/btif/src/btif_hh.cc

+5 −5

Original line number	Diff line number	Diff line
		@@ -1908,7 +1908,7 @@ static bt_status_t set_protocol(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,
		} else if (protocolMode != BTA_HH_PROTO_RPT_MODE &&
		protocolMode != BTA_HH_PROTO_BOOT_MODE) {
		log::warn("device proto_mode = {}", proto_mode);
		return BT_STATUS_FAIL;
		return BT_STATUS_PARM_INVALID;
		} else {
		BTA_HhSetProtoMode(p_dev->dev_handle, protocolMode);
		}
		@@ -1952,7 +1952,7 @@ static bt_status_t get_report(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,
		log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum::
		HIDH_COUNT_WRONG_REPORT_TYPE,
		1);
		return BT_STATUS_FAIL;
		return BT_STATUS_UNSUPPORTED;
		} else {
		BTA_HhGetReport(p_dev->dev_handle, reportType, reportId, bufferSize);
		}
		@@ -2029,7 +2029,7 @@ static bt_status_t set_report(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,
		log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum::
		HIDH_COUNT_WRONG_REPORT_TYPE,
		1);
		return BT_STATUS_FAIL;
		return BT_STATUS_UNSUPPORTED;
		} else {
		int hex_bytes_filled;
		size_t len = (strlen(report) + 1) / 2;
		@@ -2044,7 +2044,7 @@ static bt_status_t set_report(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,
		if (p_buf == NULL) {
		log::error("failed to allocate RPT buffer, len = {}", hex_bytes_filled);
		osi_free(hexbuf);
		return BT_STATUS_FAIL;
		return BT_STATUS_NOMEM;
		}
		BTA_HhSetReport(p_dev->dev_handle, reportType, p_buf);
		osi_free(hexbuf);
		@@ -2094,7 +2094,7 @@ static bt_status_t send_data(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,
		if (p_buf == NULL) {
		log::error("failed to allocate RPT buffer, len = {}", hex_bytes_filled);
		osi_free(hexbuf);
		return BT_STATUS_FAIL;
		return BT_STATUS_NOMEM;
		}
		p_buf->layer_specific = BTA_HH_RPTT_OUTPUT;
		BTA_HhSendData(p_dev->dev_handle, link_spec, p_buf);

system/btif/src/btif_jni_task.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ bt_status_t do_in_jni_thread(const base::Location& from_here,
		base::OnceClosure task) {
		if (!jni_thread.DoInThread(from_here, std::move(task))) {
		log::error("Post task to task runner failed!");
		return BT_STATUS_FAIL;
		return BT_STATUS_JNI_THREAD_ATTACH_ERROR;
		}
		return BT_STATUS_SUCCESS;
		}