Merge "wifi: Add the connected frequency in the state change event" (d8496d06) · Commits · e / os / android_hardware_interfaces

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl

+4 −1

Original line number	Diff line number	Diff line
		@@ -60,17 +60,20 @@ interface ISupplicantStaIfaceCallback {
		oneway void onNetworkNotFound(in byte[] ssid);
		oneway void onNetworkRemoved(in int id);
		oneway void onPmkCacheAdded(in long expirationTimeInSec, in byte[] serializedEntry);
		/**
		* @deprecated This callback is deprecated from AIDL v2, newer HAL should call onSupplicantStateChanged()
		*/
		oneway void onStateChanged(in android.hardware.wifi.supplicant.StaIfaceCallbackState newState, in byte[] bssid, in int id, in byte[] ssid, in boolean filsHlpSent);
		oneway void onWpsEventFail(in byte[] bssid, in android.hardware.wifi.supplicant.WpsConfigError configError, in android.hardware.wifi.supplicant.WpsErrorIndication errorInd);
		oneway void onWpsEventPbcOverlap();
		oneway void onWpsEventSuccess();
		oneway void onQosPolicyReset();
		oneway void onQosPolicyRequest(in int qosPolicyRequestId, in android.hardware.wifi.supplicant.QosPolicyData[] qosPolicyData);
		oneway void onStateChangedWithAkm(in android.hardware.wifi.supplicant.StaIfaceCallbackState newState, in byte[] bssid, in int id, in byte[] ssid, in boolean filsHlpSent, in android.hardware.wifi.supplicant.KeyMgmtMask keyMgmtMask);
		oneway void onMloLinksInfoChanged(in android.hardware.wifi.supplicant.ISupplicantStaIfaceCallback.MloLinkInfoChangeReason reason);
		oneway void onDppConfigReceived(in android.hardware.wifi.supplicant.DppConfigurationData configData);
		oneway void onDppConnectionStatusResultSent(in android.hardware.wifi.supplicant.DppStatusErrorCode code);
		oneway void onBssFrequencyChanged(in int frequencyMhz);
		oneway void onSupplicantStateChanged(in android.hardware.wifi.supplicant.SupplicantStateChangeData stateChangeData);
		@Backing(type="int") @VintfStability
		enum MloLinkInfoChangeReason {
		TID_TO_LINK_MAP = 0,

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/SupplicantStateChangeData.aidl

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.wifi.supplicant;
		@VintfStability
		parcelable SupplicantStateChangeData {
		android.hardware.wifi.supplicant.StaIfaceCallbackState newState;
		int id;
		byte[] ssid;
		byte[] bssid;
		android.hardware.wifi.supplicant.KeyMgmtMask keyMgmtMask;
		int frequencyMhz;
		boolean filsHlpSent;
		}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaIfaceCallback.aidl

+10 −25

Original line number	Diff line number	Diff line
		@@ -29,11 +29,11 @@ import android.hardware.wifi.supplicant.DppFailureCode;
		import android.hardware.wifi.supplicant.DppProgressCode;
		import android.hardware.wifi.supplicant.DppStatusErrorCode;
		import android.hardware.wifi.supplicant.Hs20AnqpData;
		import android.hardware.wifi.supplicant.KeyMgmtMask;
		import android.hardware.wifi.supplicant.OsuMethod;
		import android.hardware.wifi.supplicant.QosPolicyData;
		import android.hardware.wifi.supplicant.StaIfaceCallbackState;
		import android.hardware.wifi.supplicant.StaIfaceReasonCode;
		import android.hardware.wifi.supplicant.SupplicantStateChangeData;
		import android.hardware.wifi.supplicant.WpsConfigError;
		import android.hardware.wifi.supplicant.WpsErrorIndication;

		@@ -259,7 +259,8 @@ oneway interface ISupplicantStaIfaceCallback {
		* \|ssid\|, \|bssid\| parameters must indicate the parameters of the network/AP
		* which caused this state transition.
		* <p>
		* This callback is deprecated from AIDL v2, newer HAL should call onStateChangedWithAkm().
		* @deprecated This callback is deprecated from AIDL v2, newer HAL should call
		* onSupplicantStateChanged()
		*
		* @param newState New State of the interface. This must be one of the \|State\|
		* values above.
		@@ -312,29 +313,6 @@ oneway interface ISupplicantStaIfaceCallback {
		*/
		void onQosPolicyRequest(in int qosPolicyRequestId, in QosPolicyData[] qosPolicyData);

		/**
		* Used to indicate a state change event on this particular iface. If this
		* event is triggered by a particular network, the \|id\|,
		* \|ssid\|, \|bssid\| parameters must indicate the parameters of the network/AP
		* which caused this state transition.
		*
		* @param newState New State of the interface. This must be one of the
		* \|StaIfaceCallbackState\| values above.
		* @param bssid BSSID of the corresponding AP which caused this state
		* change event. This must be zero'ed if this event is not
		* specific to a particular network.
		* @param id ID of the corresponding network which caused this
		* state change event. This must be invalid (-1) if this
		* event is not specific to a particular network.
		* @param ssid SSID of the corresponding network which caused this state
		* change event. This must be empty if this event is not specific
		* to a particular network.
		* @param filsHlpSent Whether FILS HLP IEs were included in this association.
		* @param keyMgmtMask current used key mgmt mask.
		*/
		void onStateChangedWithAkm(in StaIfaceCallbackState newState, in byte[] bssid, in int id,
		in byte[] ssid, in boolean filsHlpSent, in KeyMgmtMask keyMgmtMask);

		/**
		* Reason codes to be used with the callback \|ISupplicantStaIfaceCallback.onMloLinksInfoChanged\|
		*/
		@@ -393,4 +371,11 @@ oneway interface ISupplicantStaIfaceCallback {
		* @param frequencyMhz New operating frequency in MHz.
		*/
		void onBssFrequencyChanged(in int frequencyMhz);

		/**
		* Used to indicate a state change event on this particular iface.
		*
		* @param stateChangeData Supplicant state change related information.
		*/
		void onSupplicantStateChanged(in SupplicantStateChangeData stateChangeData);
		}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/SupplicantStateChangeData.aidl

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.supplicant;

		import android.hardware.wifi.supplicant.KeyMgmtMask;
		import android.hardware.wifi.supplicant.StaIfaceCallbackState;

		/**
		* Supplicant state change related information.
		*/
		@VintfStability
		parcelable SupplicantStateChangeData {
		/**
		* New State of the interface. This must be one of the
		* \|StaIfaceCallbackState\| values.
		*/
		StaIfaceCallbackState newState;
		/**
		* ID of the corresponding network which caused this
		* state change event. This must be invalid (-1) if this
		* event is not specific to a particular network.
		*/
		int id;
		/**
		* SSID of the corresponding network which caused this state
		* change event. This must be empty if this event is not specific
		* to a particular network.
		*/
		byte[] ssid;
		/**
		* BSSID of the corresponding AP which caused this state
		* change event. This must be zero'ed if this event is not
		* specific to a particular network.
		*/
		byte[/* 6 */] bssid;

		/**
		* Currently used key mgmt mask.
		*/
		KeyMgmtMask keyMgmtMask;
		/*
		* Frequency of the connected channel in MHz. This must be zero if this
		* event is not specific to a particular network.
		*/
		int frequencyMhz;
		/*
		* Flag to indicate that FILS HLP IEs were included in this association.
		* This flag is valid only for WPA_COMPLETED state change.
		*/
		boolean filsHlpSent;
		}

wifi/supplicant/aidl/vts/functional/supplicant_sta_iface_aidl_test.cpp

+3 −5

Original line number	Diff line number	Diff line
		@@ -206,11 +206,9 @@ class SupplicantStaIfaceCallback : public BnSupplicantStaIfaceCallback {
		QosPolicyData /* qosPolicyData */>&) override {
		return ndk::ScopedAStatus::ok();
		}
		::ndk::ScopedAStatus onStateChangedWithAkm(
		::aidl::android::hardware::wifi::supplicant::StaIfaceCallbackState /* newState */,
		const std::vector<uint8_t>& /* bssid /, int32_t / id */,
		const std::vector<uint8_t>& /* ssid /, bool / filsHlpSent */,
		::aidl::android::hardware::wifi::supplicant::KeyMgmtMask /* keyMgmtMask*/) override {
		::ndk::ScopedAStatus onSupplicantStateChanged(
		const ::aidl::android::hardware::wifi::supplicant::
		SupplicantStateChangeData& /* stateChangeData */) override {
		return ndk::ScopedAStatus::ok();
		}
		::ndk::ScopedAStatus onMloLinksInfoChanged(