Merge "wifi: add pmk cache interface" (aa8e91e5) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -507,7 +507,7 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.wifi.supplicant</name>
		<version>1.0-2</version>
		<version>1.0-3</version>
		<interface>
		<name>ISupplicant</name>
		<instance>default</instance>

wifi/supplicant/1.3/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@ hidl_interface {
		srcs: [
		"types.hal",
		"ISupplicant.hal",
		"ISupplicantStaIface.hal",
		"ISupplicantStaIfaceCallback.hal",
		"ISupplicantStaNetwork.hal",
		],
		interfaces: [

wifi/supplicant/1.3/ISupplicantStaIface.hal

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 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@1.3;

		import @1.0::SupplicantStatus;
		import @1.2::ISupplicantStaIface;
		import @1.3::ISupplicantStaIfaceCallback;

		/**
		* Interface exposed by the supplicant for each station mode network
		* interface (e.g wlan0) it controls.
		*/
		interface ISupplicantStaIface extends @1.2::ISupplicantStaIface {
		/**
		* Register for callbacks from this interface.
		*
		* These callbacks are invoked for events that are specific to this interface.
		* Registration of multiple callback objects is supported. These objects must
		* be automatically deleted when the corresponding client process is dead or
		* if this interface is removed.
		*
		* @param callback An instance of the \|ISupplicantStaIfaceCallback\| HIDL
		* interface object.
		* @return status Status of the operation.
		* Possible status codes:
		* \|SupplicantStatusCode.SUCCESS\|,
		* \|SupplicantStatusCode.FAILURE_UNKNOWN\|,
		* \|SupplicantStatusCode.FAILURE_IFACE_INVALID\|
		*/
		registerCallback_1_3(ISupplicantStaIfaceCallback callback)
		generates (SupplicantStatus status);
		};

wifi/supplicant/1.3/ISupplicantStaIfaceCallback.hal

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 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@1.3;

		import @1.2::ISupplicantStaIfaceCallback;

		/**
		* Callback Interface exposed by the supplicant service
		* for each station mode interface (ISupplicantStaIface).
		*
		* Clients need to host an instance of this HIDL interface object and
		* pass a reference of the object to the supplicant via the
		* corresponding \|ISupplicantStaIface.registerCallback_1_3\| method.
		*/
		interface ISupplicantStaIfaceCallback extends @1.2::ISupplicantStaIfaceCallback {
		/**
		* Indicates PMK cache added event.
		*
		* @param expirationTimeInSec expiration time in seconds
		* @param serializedEntry is serialized PMK cache entry, the content is
		* opaque for the framework and depends on the native implementation.
		*/
		oneway onPmkCacheAdded(int64_t expirationTimeInSec, vec<uint8_t> serializedEntry);
		};

wifi/supplicant/1.3/ISupplicantStaNetwork.hal

+15 −0

Original line number	Diff line number	Diff line
		@@ -47,4 +47,19 @@ interface ISupplicantStaNetwork extends @1.2::ISupplicantStaNetwork {
		* @return ocspType ocsp type.
		*/
		getOcsp() generates (SupplicantStatus status, OcspType ocspType);

		/**
		* Add a PMK into supplicant PMK cache.
		*
		* @param serializedEntry is serialized PMK cache entry, the content is
		* opaque for the framework and depends on the native implementation.
		* @return status Status of the operation
		* Possible status codes:
		* \|SupplicantStatusCode.SUCCESS\|,
		* \|SupplicantStatusCode.FAILURE_ARGS_INVALID\|,
		* \|SupplicantStatusCode.FAILURE_UNKNOWN\|,
		* \|SupplicantStatusCode.FAILURE_NETWORK_INVALID\|
		*/
		setPmkCache(vec<uint8_t> serializedEntry)
		generates (SupplicantStatus status);
		};