Add OuiKeyed Data to Aware AIDL APIs including enable,

publish, subscribe, nan pairing request and match events.

Bug: 296069900
Test: m

Change-Id: I064223e207e16b0ca24f089a9486b649a59ad1f8
This commit is contained in:
Vinay Gannevaram
2023-12-11 23:23:15 +05:30
committed by Gabriel Biren
parent 9e0b057b46
commit 91936643d4
16 changed files with 56 additions and 0 deletions

View File

@@ -45,4 +45,5 @@ parcelable NanConfigRequest {
char rssiWindowSize;
int macAddressRandomizationIntervalSec;
android.hardware.wifi.NanBandSpecificConfig[3] bandSpecificConfig;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -51,4 +51,5 @@ parcelable NanMatchInd {
byte[] scid;
android.hardware.wifi.NanPairingConfig peerPairingConfig;
android.hardware.wifi.NanIdentityResolutionAttribute peerNira;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -40,4 +40,5 @@ parcelable NanPairingConfirmInd {
android.hardware.wifi.NanPairingRequestType requestType;
boolean enablePairingCache;
android.hardware.wifi.NpkSecurityAssociation npksa;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -40,4 +40,5 @@ parcelable NanPairingRequest {
boolean enablePairingCache;
byte[16] pairingIdentityKey;
android.hardware.wifi.NanPairingSecurityConfig securityConfig;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -41,4 +41,5 @@ parcelable NanPairingRequestInd {
android.hardware.wifi.NanPairingRequestType requestType;
boolean enablePairingCache;
android.hardware.wifi.NanIdentityResolutionAttribute peerNira;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -40,4 +40,5 @@ parcelable NanPublishRequest {
boolean autoAcceptDataPathRequests;
android.hardware.wifi.NanPairingConfig pairingConfig;
byte[16] identityKey;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -40,4 +40,5 @@ parcelable NanRespondToPairingIndicationRequest {
boolean enablePairingCache;
byte[16] pairingIdentityKey;
android.hardware.wifi.NanPairingSecurityConfig securityConfig;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -43,4 +43,5 @@ parcelable NanSubscribeRequest {
android.hardware.wifi.MacAddress[] intfAddr;
android.hardware.wifi.NanPairingConfig pairingConfig;
byte[16] identityKey;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
}

View File

@@ -17,6 +17,7 @@
package android.hardware.wifi;
import android.hardware.wifi.NanBandSpecificConfig;
import android.hardware.wifi.common.OuiKeyedData;
/**
* Configuration parameters of NAN. Used when enabling and re-configuring a NAN cluster.
@@ -79,4 +80,9 @@ parcelable NanConfigRequest {
* Additional configuration provided per band. Indexed by |NanBandIndex|.
*/
NanBandSpecificConfig[3] bandSpecificConfig;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}

View File

@@ -19,6 +19,7 @@ package android.hardware.wifi;
import android.hardware.wifi.NanCipherSuiteType;
import android.hardware.wifi.NanIdentityResolutionAttribute;
import android.hardware.wifi.NanPairingConfig;
import android.hardware.wifi.common.OuiKeyedData;
/**
* Match indication structure.
@@ -137,4 +138,9 @@ parcelable NanMatchInd {
* The NIRA from peer for NAN pairing verification
*/
NanIdentityResolutionAttribute peerNira;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}

View File

@@ -19,6 +19,7 @@ package android.hardware.wifi;
import android.hardware.wifi.NanPairingRequestType;
import android.hardware.wifi.NanStatus;
import android.hardware.wifi.NpkSecurityAssociation;
import android.hardware.wifi.common.OuiKeyedData;
/**
* NAN pairing confirmation indication structure. Event indication is
@@ -51,4 +52,9 @@ parcelable NanPairingConfirmInd {
* The security association negotiated for the pairing, can be cached for future verification
*/
NpkSecurityAssociation npksa;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}

View File

@@ -18,6 +18,7 @@ package android.hardware.wifi;
import android.hardware.wifi.NanPairingRequestType;
import android.hardware.wifi.NanPairingSecurityConfig;
import android.hardware.wifi.common.OuiKeyedData;
/**
* NAN pairing initiate request.
@@ -54,4 +55,9 @@ parcelable NanPairingRequest {
* Security config used for the pairing
*/
NanPairingSecurityConfig securityConfig;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}

View File

@@ -18,6 +18,7 @@ package android.hardware.wifi;
import android.hardware.wifi.NanIdentityResolutionAttribute;
import android.hardware.wifi.NanPairingRequestType;
import android.hardware.wifi.common.OuiKeyedData;
/**
* NAN pairing request indication message structure.
@@ -58,4 +59,9 @@ parcelable NanPairingRequestInd {
* The NIRA from peer for NAN pairing verification
*/
NanIdentityResolutionAttribute peerNira;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}

View File

@@ -20,6 +20,7 @@ import android.hardware.wifi.NanDiscoveryCommonConfig;
import android.hardware.wifi.NanPairingConfig;
import android.hardware.wifi.NanPublishType;
import android.hardware.wifi.NanTxType;
import android.hardware.wifi.common.OuiKeyedData;
/**
* Publish request. Specifies a publish discovery operation.
@@ -55,4 +56,9 @@ parcelable NanPublishRequest {
* The Identity key for pairing, will generate NIRA for verification by the peer
*/
byte[16] identityKey;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}

View File

@@ -18,6 +18,7 @@ package android.hardware.wifi;
import android.hardware.wifi.NanPairingRequestType;
import android.hardware.wifi.NanPairingSecurityConfig;
import android.hardware.wifi.common.OuiKeyedData;
/**
* Response to a pairing request from a peer.
@@ -51,4 +52,9 @@ parcelable NanRespondToPairingIndicationRequest {
* Security config used for the pairing
*/
NanPairingSecurityConfig securityConfig;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}

View File

@@ -21,6 +21,7 @@ import android.hardware.wifi.NanDiscoveryCommonConfig;
import android.hardware.wifi.NanPairingConfig;
import android.hardware.wifi.NanSrfType;
import android.hardware.wifi.NanSubscribeType;
import android.hardware.wifi.common.OuiKeyedData;
/**
* Subscribe request. Specifies a subscribe discovery operation.
@@ -76,4 +77,9 @@ parcelable NanSubscribeRequest {
* The Identity key for pairing, will generate NIRA for verification by the peer
*/
byte[16] identityKey;
/**
* Optional vendor-specific parameters. Null value indicates
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
}