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

Commit 3c00d72f authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge "Add OuiKeyed Data to Aware AIDL APIs including enable, publish,... 

Merge "Add OuiKeyed Data to Aware AIDL APIs including enable, publish, subscribe, nan pairing request and match events." into main
parents e35cbd5d 91936643

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanConfigRequest.aidl

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ parcelable NanConfigRequest { 
  char rssiWindowSize;

  int macAddressRandomizationIntervalSec;

  android.hardware.wifi.NanBandSpecificConfig[3] bandSpecificConfig;

  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanMatchInd.aidl

+1 −0
Original line number Diff line number Diff line
@@ -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;

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingConfirmInd.aidl

+1 −0
Original line number Diff line number Diff line
@@ -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;

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingRequest.aidl

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ parcelable NanPairingRequest { 
  boolean enablePairingCache;

  byte[16] pairingIdentityKey;

  android.hardware.wifi.NanPairingSecurityConfig securityConfig;

  @nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingRequestInd.aidl

+1 −0
Original line number Diff line number Diff line
@@ -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;

}