Merge "wifi: Fixing Nits" am: 76cf857403 am: 13dedb9197 am: 11239d83f5 (17c5206b) · Commits · e / os / android_hardware_interfaces

wifi/1.0/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -1589,6 +1589,8 @@ $(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiApIface.hal
		$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiIface.hal
		$(GEN): $(LOCAL_PATH)/IWifiIface.hal
		$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		@@ -3447,6 +3449,8 @@ $(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiApIface.hal
		$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiIface.hal
		$(GEN): $(LOCAL_PATH)/IWifiIface.hal
		$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

+11 −1

Original line number	Diff line number	Diff line
		@@ -22,5 +22,15 @@ import IWifiIface;
		* Interface used to represent a single AP iface.
		*/
		interface IWifiApIface extends IWifiIface {
		/** TODO(rpius): Add methods to the interface. */
		/**
		* Set country code for this iface.
		*
		* @param code 2 byte country code (as defined in ISO 3166) to set.
		* @return status Status of the operation.
		* Possible status codes:
		* \|WifiStatusCode.SUCCESS\|,
		* \|WifiStatusCode.FAILURE_UNKNOWN\|,
		* \|WifiStatusCode.FAILURE_IFACE_INVALID\|
		*/
		setCountryCode(int8_t[2] code) generates (WifiStatus status);
		};

+2 −15

Original line number	Diff line number	Diff line
		@@ -439,7 +439,8 @@ interface IWifiStaIface extends IWifiIface {

		/**
		* API to start packet fate monitoring.
		* - Once stared, monitoring must remain active until HAL is unloaded.
		* - Once started, monitoring must remain active until HAL is stopped or the
		* chip is reconfigured.
		* - When HAL is unloaded, all packet fate buffers must be cleared.
		* - The packet fates are used to monitor the state of packets transmitted/
		* received during association.
		@@ -454,20 +455,6 @@ interface IWifiStaIface extends IWifiIface {
		*/
		startDebugPacketFateMonitoring() generates (WifiStatus status);

		/**
		* API to stop packet fate monitoring.
		*
		* @return status WifiStatus of the operation.
		* Possible status codes:
		* \|WifiStatusCode.SUCCESS\|,
		* \|WifiStatusCode.ERROR_WIFI_IFACE_INVALID\|,
		* \|WifiStatusCode.ERROR_NOT_SUPPORTED\|,
		* \|WifiStatusCode.ERROR_NOT_STARTED\|,
		* \|WifiStatusCode.ERROR_NOT_AVAILABLE\|,
		* \|WifiStatusCode.ERROR_UNKNOWN\|
		*/
		stopDebugPacketFateMonitoring() generates (WifiStatus status);

		/**
		* API to retrieve fates of outbound packets.
		* - HAL implementation must return the fates of

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.wifi@1.0-service
		LOCAL_MODULE_RELATIVE_PATH := hw
		LOCAL_CPPFLAGS := -Wall -Wno-unused-parameter -Werror -Wextra
		LOCAL_CPPFLAGS := -Wall -Werror -Wextra
		LOCAL_SRC_FILES := \
		hidl_struct_util.cpp \
		service.cpp \

+0 −5

Original line number	Diff line number	Diff line
		@@ -107,11 +107,6 @@ WifiStatus Wifi::startInternal() {
		LOG(ERROR) << "Failed to invoke onStart callback";
		};
		}
		for (const auto& callback : event_callbacks_) {
		if (!callback->onFailure(wifi_status).isOk()) {
		LOG(ERROR) << "Failed to invoke onFailure callback";
		}
		}
		} else {
		for (const auto& callback : event_callbacks_) {
		if (!callback->onFailure(wifi_status).isOk()) {