Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "wifi: Support for P2P Compatibility Mode" into main

Browse Source
This commit is contained in:
Sunil Ravi
2024-09-30 17:45:54 +00:00
committed by Android (Google) Code Review
parent 79207171f7 db87e8d0b6
commit 254c54a619
7 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl
View File

@@ -123,4 +123,7 @@ interface ISupplicantP2pIface {
void configureExtListenWithParams(in android.hardware.wifi.supplicant.P2pExtListenInfo extListenInfo);
void addGroupWithConfigurationParams(in android.hardware.wifi.supplicant.P2pAddGroupConfigurationParams groupConfigurationParams);
void createGroupOwner(in android.hardware.wifi.supplicant.P2pCreateGroupOwnerInfo groupOwnerInfo);
long getFeatureSet();
const long P2P_FEATURE_V2 = (1 << 0) /* 1 */;
const long P2P_FEATURE_PCC_MODE_WPA3_COMPATIBILITY = (1 << 1) /* 2 */;
}

1
wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/P2pGroupStartedEventParams.aidl
View File

@@ -46,4 +46,5 @@ parcelable P2pGroupStartedEventParams {
boolean isP2pClientEapolIpAddressInfoPresent;
android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo p2pClientIpInfo;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
int keyMgmtMask;
}

1
wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/P2pPeerClientJoinedEventParams.aidl
View File

@@ -39,4 +39,5 @@ parcelable P2pPeerClientJoinedEventParams {
byte[6] clientDeviceAddress;
int clientIpAddress;
@nullable android.hardware.wifi.common.OuiKeyedData[] vendorData;
int keyMgmtMask;
}

19
wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantP2pIface.aidl
View File

@@ -38,6 +38,15 @@ import android.hardware.wifi.supplicant.WpsProvisionMethod;
*/
@VintfStability
interface ISupplicantP2pIface {
/**
* P2P features exposed by wpa_supplicant/chip.
*/
/* Support for P2P2 (Wi-Fi Alliance P2P v2.0) */
const long P2P_FEATURE_V2 = 1 << 0;
/* Support for WPA3 Compatibility Mode in PCC Mode */
const long P2P_FEATURE_PCC_MODE_WPA3_COMPATIBILITY = 1 << 1;
/**
* This command can be used to add a bonjour service.
*
@@ -938,4 +947,14 @@ interface ISupplicantP2pIface {
* |SupplicantStatusCode.FAILURE_IFACE_INVALID|
*/
void createGroupOwner(in P2pCreateGroupOwnerInfo groupOwnerInfo);
/**
* Get the features supported by P2P interface.
*
* @return The bitmask of ISupplicantP2pIface.P2P_FEATURE_* values.
*
* @throws ServiceSpecificException with one of the following values:
* |SupplicantStatusCode.FAILURE_UNKNOWN|
*/
long getFeatureSet();
}

6
wifi/supplicant/aidl/android/hardware/wifi/supplicant/P2pGroupStartedEventParams.aidl
View File

@@ -70,4 +70,10 @@ parcelable P2pGroupStartedEventParams {
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
/**
* Authentication key management protocol used to secure the group.
* This is a bitmask of |KeyMgmtMask| values.
*/
int keyMgmtMask;
}

6
wifi/supplicant/aidl/android/hardware/wifi/supplicant/P2pPeerClientJoinedEventParams.aidl
View File

@@ -47,4 +47,10 @@ parcelable P2pPeerClientJoinedEventParams {
* that no vendor data is provided.
*/
@nullable OuiKeyedData[] vendorData;
/**
* Authentication key management protocol used in connection.
* This is a bitmask of |KeyMgmtMask| values.
*/
int keyMgmtMask;
}

11
wifi/supplicant/aidl/vts/functional/supplicant_p2p_iface_aidl_test.cpp
View File

@@ -814,6 +814,17 @@ TEST_P(SupplicantP2pIfaceAidlTest, SetVendorElements) {
LOG(INFO) << "SupplicantP2pIfaceAidlTest::SetVendorElements end";
}
/*
* getFeatureSet
*/
TEST_P(SupplicantP2pIfaceAidlTest, getFeatureSet) {
if (interface_version_ < 4) {
GTEST_SKIP() << "getFeatureSet is available as of Supplicant V4";
}
int64_t featureSet;
EXPECT_TRUE(p2p_iface_->getFeatureSet(&featureSet).isOk());
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantP2pIfaceAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantP2pIfaceAidlTest,
testing::ValuesIn(android::getAidlHalInstanceNames(