Merge "P2P: Add OuiKeyedData for P2P connect and group event callbacks." into main
This commit is contained in:
commit
f0c9f34ccc
8 changed files with 33 additions and 0 deletions
|
@ -45,4 +45,5 @@ parcelable P2pGroupStartedEventParams {
|
||||||
byte[6] goInterfaceAddress;
|
byte[6] goInterfaceAddress;
|
||||||
boolean isP2pClientEapolIpAddressInfoPresent;
|
boolean isP2pClientEapolIpAddressInfoPresent;
|
||||||
android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo p2pClientIpInfo;
|
android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo p2pClientIpInfo;
|
||||||
|
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,4 +37,5 @@ parcelable P2pPeerClientDisconnectedEventParams {
|
||||||
String groupInterfaceName;
|
String groupInterfaceName;
|
||||||
byte[6] clientInterfaceAddress;
|
byte[6] clientInterfaceAddress;
|
||||||
byte[6] clientDeviceAddress;
|
byte[6] clientDeviceAddress;
|
||||||
|
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,4 +38,5 @@ parcelable P2pPeerClientJoinedEventParams {
|
||||||
byte[6] clientInterfaceAddress;
|
byte[6] clientInterfaceAddress;
|
||||||
byte[6] clientDeviceAddress;
|
byte[6] clientDeviceAddress;
|
||||||
int clientIpAddress;
|
int clientIpAddress;
|
||||||
|
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,4 +40,5 @@ parcelable P2pProvisionDiscoveryCompletedEventParams {
|
||||||
android.hardware.wifi.supplicant.WpsConfigMethods configMethods;
|
android.hardware.wifi.supplicant.WpsConfigMethods configMethods;
|
||||||
String generatedPin;
|
String generatedPin;
|
||||||
String groupInterfaceName;
|
String groupInterfaceName;
|
||||||
|
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
package android.hardware.wifi.supplicant;
|
package android.hardware.wifi.supplicant;
|
||||||
|
|
||||||
|
import android.hardware.wifi.common.OuiKeyedData;
|
||||||
import android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo;
|
import android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -63,4 +64,10 @@ parcelable P2pGroupStartedEventParams {
|
||||||
* The value is undefined if isP2pClientEapolIpAddressInfoPresent is false.
|
* The value is undefined if isP2pClientEapolIpAddressInfoPresent is false.
|
||||||
*/
|
*/
|
||||||
P2pClientEapolIpAddressInfo p2pClientIpInfo;
|
P2pClientEapolIpAddressInfo p2pClientIpInfo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optional vendor-specific parameters. Null value indicates
|
||||||
|
* that no vendor data is provided.
|
||||||
|
*/
|
||||||
|
@nullable OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,8 @@
|
||||||
|
|
||||||
package android.hardware.wifi.supplicant;
|
package android.hardware.wifi.supplicant;
|
||||||
|
|
||||||
|
import android.hardware.wifi.common.OuiKeyedData;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parameters passed as a part of P2P peer client disconnected event.
|
* Parameters passed as a part of P2P peer client disconnected event.
|
||||||
*/
|
*/
|
||||||
|
@ -29,4 +31,10 @@ parcelable P2pPeerClientDisconnectedEventParams {
|
||||||
|
|
||||||
/** P2P device interface MAC address of the client that disconnected. */
|
/** P2P device interface MAC address of the client that disconnected. */
|
||||||
byte[6] clientDeviceAddress;
|
byte[6] clientDeviceAddress;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optional vendor-specific parameters. Null value indicates
|
||||||
|
* that no vendor data is provided.
|
||||||
|
*/
|
||||||
|
@nullable OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,8 @@
|
||||||
|
|
||||||
package android.hardware.wifi.supplicant;
|
package android.hardware.wifi.supplicant;
|
||||||
|
|
||||||
|
import android.hardware.wifi.common.OuiKeyedData;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parameters passed as a part of P2P peer client joined event.
|
* Parameters passed as a part of P2P peer client joined event.
|
||||||
*/
|
*/
|
||||||
|
@ -39,4 +41,10 @@ parcelable P2pPeerClientJoinedEventParams {
|
||||||
* The value is set to zero if the IP address is not allocated via EAPOL exchange.
|
* The value is set to zero if the IP address is not allocated via EAPOL exchange.
|
||||||
*/
|
*/
|
||||||
int clientIpAddress;
|
int clientIpAddress;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optional vendor-specific parameters. Null value indicates
|
||||||
|
* that no vendor data is provided.
|
||||||
|
*/
|
||||||
|
@nullable OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
package android.hardware.wifi.supplicant;
|
package android.hardware.wifi.supplicant;
|
||||||
|
|
||||||
|
import android.hardware.wifi.common.OuiKeyedData;
|
||||||
import android.hardware.wifi.supplicant.P2pProvDiscStatusCode;
|
import android.hardware.wifi.supplicant.P2pProvDiscStatusCode;
|
||||||
import android.hardware.wifi.supplicant.WpsConfigMethods;
|
import android.hardware.wifi.supplicant.WpsConfigMethods;
|
||||||
|
|
||||||
|
@ -45,4 +46,9 @@ parcelable P2pProvisionDiscoveryCompletedEventParams {
|
||||||
* Refer to WFA Wi-Fi_Direct_Specification_v1.9 section 3.2.1 for more details.
|
* Refer to WFA Wi-Fi_Direct_Specification_v1.9 section 3.2.1 for more details.
|
||||||
*/
|
*/
|
||||||
String groupInterfaceName;
|
String groupInterfaceName;
|
||||||
|
/**
|
||||||
|
* Optional vendor-specific parameters. Null value indicates
|
||||||
|
* that no vendor data is provided.
|
||||||
|
*/
|
||||||
|
@nullable OuiKeyedData[] vendorData;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue