wifi: Remove unused methods in IWifiRttController am: 824e475cd1 (ab7a7804) · Commits · e / os / android_hardware_interfaces

wifi/1.0/Android.mk

+0 −152

Original line number	Original line	Diff line number	Diff line
	@@ -1175,25 +1175,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)		$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)		LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttChannelMap)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttChannelMap.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttChannelMap

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (RttConfig)		# Build types.hal (RttConfig)
	#		#
	@@ -1213,63 +1194,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)		$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)		LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttDebugFormat)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugFormat.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttDebugFormat

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttDebugInfo)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugInfo.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttDebugInfo

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttDebugType)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugType.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttDebugType

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (RttLciInformation)		# Build types.hal (RttLciInformation)
	#		#
	@@ -3736,25 +3660,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)		$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)		LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttChannelMap)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttChannelMap.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttChannelMap

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (RttConfig)		# Build types.hal (RttConfig)
	#		#
	@@ -3774,63 +3679,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)		$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)		LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttDebugFormat)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugFormat.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttDebugFormat

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttDebugInfo)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugInfo.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttDebugInfo

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#
	# Build types.hal (RttDebugType)
	#
	GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugType.java
	$(GEN): $(HIDL)
	$(GEN): PRIVATE_HIDL := $(HIDL)
	$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
	$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
	$(GEN): PRIVATE_CUSTOM_TOOL = \
	$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
	-Ljava \
	-randroid.hardware:hardware/interfaces \
	-randroid.hidl:system/libhidl/transport \
	android.hardware.wifi@1.0::types.RttDebugType

	$(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (RttLciInformation)		# Build types.hal (RttLciInformation)
	#		#

wifi/1.0/IWifiRttController.hal

+0 −65

Original line number	Original line	Diff line number	Diff line
	@@ -82,45 +82,6 @@ interface IWifiRttController {
	rangeCancel(CommandId cmdId, vec<MacAddress> addrs)		rangeCancel(CommandId cmdId, vec<MacAddress> addrs)
	generates (WifiStatus status);		generates (WifiStatus status);

	/**
	* API to start publishing the channel map on responder device in an NBD
	* cluster.
	* Responder device must take this request and schedule broadcasting the
	* channel map in a NBD ranging attribute in a Service Discovery Frame.
	* DE must automatically remove the ranging attribute from the OTA queue
	* after number of Discovery Window specified by numDw where each
	* Discovery Window is 512 TUs apart.
	*
	* @param cmdId command Id to use for this invocation.
	* @param params Instance of \|RttChannelMap\|.
	* @return status WifiStatus of the operation.
	* Possible status codes:
	* \|WifiStatusCode.SUCCESS\|,
	* \|WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID\|,
	* \|WifiStatusCode.ERROR_INVALID_ARGS\|,
	* \|WifiStatusCode.ERROR_NOT_AVAILABLE\|,
	* \|WifiStatusCode.ERROR_UNKNOWN\|
	*/
	setChannelMap(CommandId cmdId, RttChannelMap params, uint32_t numDw)
	generates (WifiStatus status);

	/**
	* API to clear the channel map on the responder device in an NBD cluster.
	* Responder device must cancel future ranging channel request, starting from
	* next Discovery Window interval and must also stop broadcasting NBD
	* ranging attribute in Service Discovery Frame.
	*
	* @param cmdId command Id corresponding to the original request.
	* @return status WifiStatus of the operation.
	* Possible status codes:
	* \|WifiStatusCode.SUCCESS\|,
	* \|WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID\|,
	* \|WifiStatusCode.ERROR_INVALID_ARGS\|,
	* \|WifiStatusCode.ERROR_NOT_AVAILABLE\|,
	* \|WifiStatusCode.ERROR_UNKNOWN\|
	*/
	clearChannelMap(CommandId cmdId) generates (WifiStatus status);

	/**		/**
	* RTT capabilities of the device.		* RTT capabilities of the device.
	*		*
	@@ -133,32 +94,6 @@ interface IWifiRttController {
	*/		*/
	getCapabilities() generates (WifiStatus status, RttCapabilities capabilities);		getCapabilities() generates (WifiStatus status, RttCapabilities capabilities);

	/**
	* Set configuration for debug.
	*
	* @param type debug level to be set.
	* @return status WifiStatus of the operation.
	* Possible status codes:
	* \|WifiStatusCode.SUCCESS\|,
	* \|WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID\|,
	* \|WifiStatusCode.ERROR_INVALID_ARGS\|,
	* \|WifiStatusCode.ERROR_NOT_AVAILABLE\|,
	* \|WifiStatusCode.ERROR_UNKNOWN\|
	*/
	setDebugCfg(RttDebugType Type) generates (WifiStatus status);

	/**
	* Get the debug information.
	*
	* @return status WifiStatus of the operation.
	* Possible status codes:
	* \|WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID\|,
	* \|WifiStatusCode.ERROR_NOT_AVAILABLE\|,
	* \|WifiStatusCode.ERROR_UNKNOWN\|
	* @return info Instance of \|RttDebugInfo\|.
	*/
	getDebugInfo() generates (WifiStatus status, RttDebugInfo info);

	/**		/**
	* API to configure the LCI(Location civic information).		* API to configure the LCI(Location civic information).
	* Used in RTT Responder mode only.		* Used in RTT Responder mode only.

wifi/1.0/default/hidl_struct_util.cpp

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1155,18 +1155,6 @@ bool convertHidlRttConfigToLegacy(const RttConfig& hidl_config,
	return true;		return true;
	}		}

	bool convertHidlRttChannelMapToLegacy(
	const RttChannelMap& hidl_map, legacy_hal::wifi_channel_map* legacy_map) {
	if (!legacy_map) {
	return false;
	}
	CHECK(hidl_map.availablity.size() == sizeof(legacy_map->availablity));
	memcpy(legacy_map->availablity,
	hidl_map.availablity.data(),
	hidl_map.availablity.size());
	return true;
	}

	bool convertHidlRttLciInformationToLegacy(		bool convertHidlRttLciInformationToLegacy(
	const RttLciInformation& hidl_info,		const RttLciInformation& hidl_info,
	legacy_hal::wifi_lci_information* legacy_info) {		legacy_hal::wifi_lci_information* legacy_info) {

wifi/1.0/default/hidl_struct_util.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -147,8 +147,6 @@ bool convertLegacyNanTransmitFollowupIndToHidl(
	// RTT controller conversion methods.		// RTT controller conversion methods.
	bool convertHidlRttConfigToLegacy(const RttConfig& hidl_config,		bool convertHidlRttConfigToLegacy(const RttConfig& hidl_config,
	legacy_hal::wifi_rtt_config* legacy_config);		legacy_hal::wifi_rtt_config* legacy_config);
	bool convertHidlRttChannelMapToLegacy(const RttChannelMap& hidl_map,
	legacy_hal::wifi_channel_map* legacy_map);
	bool convertHidlRttLciInformationToLegacy(		bool convertHidlRttLciInformationToLegacy(
	const RttLciInformation& hidl_info,		const RttLciInformation& hidl_info,
	legacy_hal::wifi_lci_information* legacy_info);		legacy_hal::wifi_lci_information* legacy_info);

wifi/1.0/default/wifi_rtt_controller.cpp

+0 −61

Original line number	Original line	Diff line number	Diff line
	@@ -83,28 +83,6 @@ Return<void> WifiRttController::rangeCancel(
	addrs);		addrs);
	}		}

	Return<void> WifiRttController::setChannelMap(uint32_t cmd_id,
	const RttChannelMap& params,
	uint32_t num_dw,
	setChannelMap_cb hidl_status_cb) {
	return validateAndCall(this,
	WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
	&WifiRttController::setChannelMapInternal,
	hidl_status_cb,
	cmd_id,
	params,
	num_dw);
	}

	Return<void> WifiRttController::clearChannelMap(
	uint32_t cmd_id, clearChannelMap_cb hidl_status_cb) {
	return validateAndCall(this,
	WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
	&WifiRttController::clearChannelMapInternal,
	hidl_status_cb,
	cmd_id);
	}

	Return<void> WifiRttController::getCapabilities(		Return<void> WifiRttController::getCapabilities(
	getCapabilities_cb hidl_status_cb) {		getCapabilities_cb hidl_status_cb) {
	return validateAndCall(this,		return validateAndCall(this,
	@@ -113,22 +91,6 @@ Return<void> WifiRttController::getCapabilities(
	hidl_status_cb);		hidl_status_cb);
	}		}

	Return<void> WifiRttController::setDebugCfg(RttDebugType type,
	setDebugCfg_cb hidl_status_cb) {
	return validateAndCall(this,
	WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
	&WifiRttController::setDebugCfgInternal,
	hidl_status_cb,
	type);
	}

	Return<void> WifiRttController::getDebugInfo(getDebugInfo_cb hidl_status_cb) {
	return validateAndCall(this,
	WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
	&WifiRttController::getDebugInfoInternal,
	hidl_status_cb);
	}

	Return<void> WifiRttController::setLci(uint32_t cmd_id,		Return<void> WifiRttController::setLci(uint32_t cmd_id,
	const RttLciInformation& lci,		const RttLciInformation& lci,
	setLci_cb hidl_status_cb) {		setLci_cb hidl_status_cb) {
	@@ -209,35 +171,12 @@ WifiStatus WifiRttController::rangeCancelInternal(
	return createWifiStatus(WifiStatusCode::SUCCESS);		return createWifiStatus(WifiStatusCode::SUCCESS);
	}		}

	WifiStatus WifiRttController::setChannelMapInternal(
	uint32_t /* cmd_id */,
	const RttChannelMap& /* params */,
	uint32_t /* num_dw */) {
	// TODO implement
	return createWifiStatus(WifiStatusCode::SUCCESS);
	}

	WifiStatus WifiRttController::clearChannelMapInternal(uint32_t /* cmd_id */) {
	// TODO implement
	return createWifiStatus(WifiStatusCode::SUCCESS);
	}

	std::pair<WifiStatus, RttCapabilities>		std::pair<WifiStatus, RttCapabilities>
	WifiRttController::getCapabilitiesInternal() {		WifiRttController::getCapabilitiesInternal() {
	// TODO implement		// TODO implement
	return {createWifiStatus(WifiStatusCode::SUCCESS), {}};		return {createWifiStatus(WifiStatusCode::SUCCESS), {}};
	}		}

	WifiStatus WifiRttController::setDebugCfgInternal(RttDebugType /* type */) {
	// TODO implement
	return createWifiStatus(WifiStatusCode::SUCCESS);
	}

	std::pair<WifiStatus, RttDebugInfo> WifiRttController::getDebugInfoInternal() {
	// TODO implement
	return {createWifiStatus(WifiStatusCode::SUCCESS), {}};
	}

	WifiStatus WifiRttController::setLciInternal(		WifiStatus WifiRttController::setLciInternal(
	uint32_t /* cmd_id /, const RttLciInformation& / lci */) {		uint32_t /* cmd_id /, const RttLciInformation& / lci */) {
	// TODO implement		// TODO implement