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

Commit f0c9f34c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "P2P: Add OuiKeyedData for P2P connect and group event callbacks." into main

parents 8626ab36 7fbbc9fd

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

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ parcelable P2pGroupStartedEventParams { 
  byte[6] goInterfaceAddress;

  boolean isP2pClientEapolIpAddressInfoPresent;

  android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo p2pClientIpInfo;

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

}

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

+1 −0
Original line number Diff line number Diff line
@@ -37,4 +37,5 @@ parcelable P2pPeerClientDisconnectedEventParams { 
  String groupInterfaceName;

  byte[6] clientInterfaceAddress;

  byte[6] clientDeviceAddress;

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

}

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

+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ parcelable P2pPeerClientJoinedEventParams { 
  byte[6] clientInterfaceAddress;

  byte[6] clientDeviceAddress;

  int clientIpAddress;

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

}

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

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ parcelable P2pProvisionDiscoveryCompletedEventParams { 
  android.hardware.wifi.supplicant.WpsConfigMethods configMethods;

  String generatedPin;

  String groupInterfaceName;

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

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/P2pGroupStartedEventParams.aidl

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.wifi.supplicant;



import android.hardware.wifi.common.OuiKeyedData;

import android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo;



/**
@@ -63,4 +64,10 @@ parcelable P2pGroupStartedEventParams { 
     * The value is undefined if isP2pClientEapolIpAddressInfoPresent is false.

     */

    P2pClientEapolIpAddressInfo p2pClientIpInfo;



    /**

     * Optional vendor-specific parameters. Null value indicates

     * that no vendor data is provided.

     */

    @nullable OuiKeyedData[] vendorData;

}