Merge changes from topic "b178126071_selfRecoveryEnhancement" into sc-dev (470fc06a) · Commits · e / os / android_hardware_interfaces

wifi/1.5/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ hidl_interface {
		"IWifiNanIface.hal",
		"IWifiNanIfaceEventCallback.hal",
		"IWifiStaIface.hal",
		"IWifiEventCallback.hal",
		],
		interfaces: [
		"android.hardware.wifi@1.0",

wifi/1.5/IWifi.hal

+20 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.hardware.wifi@1.5;

		import @1.4::IWifi;
		import IWifiEventCallback;
		import @1.0::WifiStatus;

		/**
		* This is the root of the HAL module and is the interface returned when
		@@ -24,4 +26,21 @@ import @1.4::IWifi;
		* module loaded in the system.
		* IWifi.getChip() must return @1.5::IWifiChip
		*/
		interface IWifi extends @1.4::IWifi {};
		interface IWifi extends @1.4::IWifi {
		/**
		* Requests notifications of significant events for the HAL. Multiple calls to
		* this must register multiple callbacks each of which must receive all
		* events. \|IWifiEventCallback\| object registration must be independent of the
		* state of the rest of the HAL and must persist though stops/starts. These
		* objects must be deleted when the corresponding client process is dead.
		*
		* @param callback An instance of the \|IWifiEventCallback\| HIDL interface
		* object.
		* @return status WifiStatus of the operation.
		* Possible status codes:
		* \|WifiStatusCode.SUCCESS\|,
		* \|WifiStatusCode.UNKNOWN\|
		*/
		registerEventCallback_1_5(IWifiEventCallback callback)
		generates (WifiStatus status);
		};

wifi/1.5/IWifiChip.hal

+21 −0

Original line number	Diff line number	Diff line
		@@ -303,4 +303,25 @@ interface IWifiChip extends @1.4::IWifiChip {
		getUsableChannels(WifiBand band, bitfield<WifiIfaceMode> ifaceModeMask,
		bitfield<UsableChannelFilter> filterMask)
		generates (WifiStatus status, vec<WifiUsableChannel> channels);

		/**
		* Trigger subsystem restart
		*
		* If the framework detects a problem (e.g. connection failure),
		* it must call this function to attempt recovery.
		*
		* When the wifi HAL receiveds triggerSubsystemRestart(), it must restart
		* the wlan subsystem, especially the wlan firmware.
		*
		* Regarding the callback function for subsystem restart, refer to documentation of
		* \|IWifiEventCallback.onSubsystemRestart\| for details.
		*
		* @return status WifiStatus of the operation.
		* Possible status codes:
		* \|WifiStatusCode.SUCCESS\|,
		* \|WifiStatusCode.ERROR_WIFI_CHIP_INVALID\|,
		* \|WifiStatusCode.ERROR_NOT_AVAILABLE\|,
		* \|WifiStatusCode.ERROR_UNKNOWN\|
		*/
		triggerSubsystemRestart() generates (WifiStatus status);
		};

wifi/1.5/IWifiEventCallback.hal

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.wifi@1.5;

		import @1.0::IWifiEventCallback;
		import @1.0::WifiStatus;

		interface IWifiEventCallback extends @1.0::IWifiEventCallback {
		/**
		* Must be called when the Wi-Fi subsystem restart completes.
		* Once this event is received, framework must fully reset the Wi-Fi stack state.
		*/
		oneway onSubsystemRestart(WifiStatus status);
		};

wifi/1.5/default/wifi.cpp

+17 −3

Original line number	Diff line number	Diff line
		@@ -50,13 +50,21 @@ bool Wifi::isValid() {
		}

		Return<void> Wifi::registerEventCallback(
		const sp<IWifiEventCallback>& event_callback,
		const sp<V1_0::IWifiEventCallback>& event_callback,
		registerEventCallback_cb hidl_status_cb) {
		return validateAndCall(this, WifiStatusCode::ERROR_UNKNOWN,
		&Wifi::registerEventCallbackInternal, hidl_status_cb,
		event_callback);
		}

		Return<void> Wifi::registerEventCallback_1_5(
		const sp<V1_5::IWifiEventCallback>& event_callback,
		registerEventCallback_1_5_cb hidl_status_cb) {
		return validateAndCall(this, WifiStatusCode::ERROR_UNKNOWN,
		&Wifi::registerEventCallbackInternal_1_5,
		hidl_status_cb, event_callback);
		}

		Return<bool> Wifi::isStarted() { return run_state_ != RunState::STOPPED; }

		Return<void> Wifi::start(start_cb hidl_status_cb) {
		@@ -95,7 +103,13 @@ Return<void> Wifi::debug(const hidl_handle& handle,
		}

		WifiStatus Wifi::registerEventCallbackInternal(
		const sp<IWifiEventCallback>& event_callback) {
		const sp<V1_0::IWifiEventCallback>& event_callback __unused) {
		// Deprecated support for this callback.
		return createWifiStatus(WifiStatusCode::ERROR_NOT_SUPPORTED);
		}

		WifiStatus Wifi::registerEventCallbackInternal_1_5(
		const sp<V1_5::IWifiEventCallback>& event_callback) {
		if (!event_cb_handler_.addCallback(event_callback)) {
		return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN);
		}
		@@ -117,7 +131,7 @@ WifiStatus Wifi::startInternal() {
		WifiStatus wifi_status =
		createWifiStatus(WifiStatusCode::ERROR_UNKNOWN, error);
		for (const auto& callback : event_cb_handler_.getCallbacks()) {
		if (!callback->onFailure(wifi_status).isOk()) {
		if (!callback->onSubsystemRestart(wifi_status).isOk()) {
		LOG(ERROR) << "Failed to invoke onFailure callback";
		}
		}