Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b77c7962 authored Mar 03, 2023 by TreeHugger Robot Committed by Android (Google) Code Review Mar 03, 2023

Merge "Update comments to indicate whether NAN enums are used as an enum or a...

Merge "Update comments to indicate whether NAN enums are used as an enum or a bitmask." into udc-dev

parents 53368fa3 e817aeb6

wifi/aidl/android/hardware/wifi/NanBootstrappingRequest.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ parcelable NanBootstrappingRequest {
		byte[6] peerDiscMacAddr;

		/**
		* Bootstrapping method in the request, one of the \|NanBootstrappingMethod\|
		* One of \|NanBootstrappingMethod\| indicating the bootstrapping method in the request.
		*/
		NanBootstrappingMethod requestBootstrappingMethod;

wifi/aidl/android/hardware/wifi/NanBootstrappingRequestInd.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ parcelable NanBootstrappingRequestInd {
		int bootstrappingInstanceId;

		/**
		* Bootstrapping method in the incoming request, one of the \|NanBootstrappingMethod\|
		* One of \|NanBootstrappingMethod\| indicating the bootstrapping method in the incoming request.
		*/
		NanBootstrappingMethod requestBootstrappingMethod;
		}

wifi/aidl/android/hardware/wifi/NanDataPathSecurityConfig.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,8 @@ parcelable NanDataPathSecurityConfig {
		*/
		NanDataPathSecurityType securityType;
		/**
		* Cipher type for data-paths. If \|securityType\| is \|NanDataPathSecurityType.OPEN\| then must
		* One of \|NanCipherSuiteType\| indicating the cipher type for data-paths.
		* If \|securityType\| is \|NanDataPathSecurityType.OPEN\|, then this must
		* be set to \|NanCipherSuiteType.NONE\|. Otherwise a non-\|NanCipherSuiteType.NONE\| cipher suite
		* must be specified.
		*/

wifi/aidl/android/hardware/wifi/NanPairingConfig.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,8 @@ parcelable NanPairingConfig {
		*/
		boolean enablePairingVerification;
		/**
		* The set of supported bootstrapping methods. The \|NanBootstrappingMethod\| bit fields are used.
		* Bitmap of \|NanBootstrappingMethod\| values indicating the set of
		* supported bootstrapping methods.
		*/
		int supportedBootstrappingMethods;
		}

wifi/aidl/android/hardware/wifi/NanPairingSecurityConfig.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ parcelable NanPairingSecurityConfig {
		*/
		NanPairingAkm akm;
		/**
		* Cipher type for pairing. Need to be one of the \|NanCipherSuiteType.PUBLIC_KEY_PASN_128_MASK\|
		* or \|NanCipherSuiteType.PUBLIC_KEY_PASN_256_MASK\|
		* Cipher type for pairing. Must be one of \|NanCipherSuiteType.PUBLIC_KEY_PASN_128_MASK\|
		* or \|NanCipherSuiteType.PUBLIC_KEY_PASN_256_MASK\|.
		*/
		NanCipherSuiteType cipherType;
		}