diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl index db82a6e4c1..5ed7517766 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl @@ -97,6 +97,7 @@ interface IWifiChip { WIGIG = (1 << 6) /* 64 */, SET_AFC_CHANNEL_ALLOWANCE = (1 << 7) /* 128 */, T2LM_NEGOTIATION = (1 << 8) /* 256 */, + SET_VOIP_MODE = (1 << 9) /* 512 */, } @VintfStability parcelable ChipConcurrencyCombinationLimit { diff --git a/wifi/aidl/android/hardware/wifi/IWifiChip.aidl b/wifi/aidl/android/hardware/wifi/IWifiChip.aidl index cf4c88446c..d12d26c65c 100644 --- a/wifi/aidl/android/hardware/wifi/IWifiChip.aidl +++ b/wifi/aidl/android/hardware/wifi/IWifiChip.aidl @@ -83,6 +83,10 @@ interface IWifiChip { * Chip supports Tid-To-Link mapping negotiation. */ T2LM_NEGOTIATION = 1 << 8, + /** + * Chip supports voip mode setting. + */ + SET_VOIP_MODE = 1 << 9, } /** diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index 99420bd2bc..bec3e83007 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -59,6 +59,8 @@ IWifiChip::FeatureSetMask convertLegacyChipFeatureToAidl(uint64_t feature) { return IWifiChip::FeatureSetMask::P2P_RAND_MAC; case WIFI_FEATURE_AFC_CHANNEL: return IWifiChip::FeatureSetMask::SET_AFC_CHANNEL_ALLOWANCE; + case WIFI_FEATURE_SET_VOIP_MODE: + return IWifiChip::FeatureSetMask::SET_VOIP_MODE; }; CHECK(false) << "Unknown legacy feature: " << feature; return {}; @@ -109,7 +111,8 @@ bool convertLegacyChipFeaturesToAidl(uint64_t legacy_feature_set, uint32_t* aidl WIFI_FEATURE_INFRA_60G, WIFI_FEATURE_SET_LATENCY_MODE, WIFI_FEATURE_P2P_RAND_MAC, - WIFI_FEATURE_AFC_CHANNEL}; + WIFI_FEATURE_AFC_CHANNEL, + WIFI_FEATURE_SET_VOIP_MODE}; for (const auto feature : features) { if (feature & legacy_feature_set) { *aidl_feature_set |= static_cast(convertLegacyChipFeatureToAidl(feature));