wifi: Format Supplicant HAL files as a part of update API

updated the files modified via the command
m android.hardware.wifi.supplicant-update-api

Bug: 291202830
Test: Build successfully
Test: Establish P2P connection and verified from the logs that
      the P2P Client IP address is received to framework via new
      HAL API.
Change-Id: I80fffc34f0b81db85413d382475ec7744533cb8a
This commit is contained in:
Sunil Ravi
2023-11-07 01:26:51 +00:00
parent 08c4c46cc4
commit d139f8a7de
33 changed files with 194 additions and 194 deletions

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum AuthAlgMask {
OPEN = 1,
SHARED = 2,
LEAP = 4,
SAE = 16,
OPEN = (1 << 0) /* 1 */,
SHARED = (1 << 1) /* 2 */,
LEAP = (1 << 2) /* 4 */,
SAE = (1 << 4) /* 16 */,
}

View File

@@ -34,7 +34,7 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum AuxiliarySupplicantEventCode {
EAP_METHOD_SELECTED = 0,
SSID_TEMP_DISABLED = 1,
OPEN_SSL_FAILURE = 2,
EAP_METHOD_SELECTED,
SSID_TEMP_DISABLED,
OPEN_SSL_FAILURE,
}

View File

@@ -34,12 +34,12 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum BssTmDataFlagsMask {
WNM_MODE_PREFERRED_CANDIDATE_LIST_INCLUDED = 1,
WNM_MODE_ABRIDGED = 2,
WNM_MODE_DISASSOCIATION_IMMINENT = 4,
WNM_MODE_BSS_TERMINATION_INCLUDED = 8,
WNM_MODE_ESS_DISASSOCIATION_IMMINENT = 16,
MBO_TRANSITION_REASON_CODE_INCLUDED = 32,
MBO_ASSOC_RETRY_DELAY_INCLUDED = 64,
MBO_CELLULAR_DATA_CONNECTION_PREFERENCE_INCLUDED = 128,
WNM_MODE_PREFERRED_CANDIDATE_LIST_INCLUDED = (1 << 0) /* 1 */,
WNM_MODE_ABRIDGED = (1 << 1) /* 2 */,
WNM_MODE_DISASSOCIATION_IMMINENT = (1 << 2) /* 4 */,
WNM_MODE_BSS_TERMINATION_INCLUDED = (1 << 3) /* 8 */,
WNM_MODE_ESS_DISASSOCIATION_IMMINENT = (1 << 4) /* 16 */,
MBO_TRANSITION_REASON_CODE_INCLUDED = (1 << 5) /* 32 */,
MBO_ASSOC_RETRY_DELAY_INCLUDED = (1 << 6) /* 64 */,
MBO_CELLULAR_DATA_CONNECTION_PREFERENCE_INCLUDED = (1 << 7) /* 128 */,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum DppAkm {
PSK = 0,
PSK_SAE = 1,
SAE = 2,
DPP = 3,
PSK,
PSK_SAE,
SAE,
DPP,
}

View File

@@ -34,10 +34,10 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum DppCurve {
PRIME256V1 = 0,
SECP384R1 = 1,
SECP521R1 = 2,
BRAINPOOLP256R1 = 3,
BRAINPOOLP384R1 = 4,
BRAINPOOLP512R1 = 5,
PRIME256V1,
SECP384R1,
SECP521R1,
BRAINPOOLP256R1,
BRAINPOOLP384R1,
BRAINPOOLP512R1,
}

View File

@@ -34,6 +34,6 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum DppEventType {
CONFIGURATION_SENT = 0,
CONFIGURATION_APPLIED = 1,
CONFIGURATION_SENT,
CONFIGURATION_APPLIED,
}

View File

@@ -34,16 +34,16 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum DppFailureCode {
INVALID_URI = 0,
AUTHENTICATION = 1,
NOT_COMPATIBLE = 2,
CONFIGURATION = 3,
BUSY = 4,
TIMEOUT = 5,
FAILURE = 6,
NOT_SUPPORTED = 7,
CONFIGURATION_REJECTED = 8,
CANNOT_FIND_NETWORK = 9,
ENROLLEE_AUTHENTICATION = 10,
URI_GENERATION = 11,
INVALID_URI,
AUTHENTICATION,
NOT_COMPATIBLE,
CONFIGURATION,
BUSY,
TIMEOUT,
FAILURE,
NOT_SUPPORTED,
CONFIGURATION_REJECTED,
CANNOT_FIND_NETWORK,
ENROLLEE_AUTHENTICATION,
URI_GENERATION,
}

View File

@@ -34,6 +34,6 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum DppNetRole {
STA = 0,
AP = 1,
STA,
AP,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum DppProgressCode {
AUTHENTICATION_SUCCESS = 0,
RESPONSE_PENDING = 1,
CONFIGURATION_SENT_WAITING_RESPONSE = 2,
CONFIGURATION_ACCEPTED = 3,
AUTHENTICATION_SUCCESS,
RESPONSE_PENDING,
CONFIGURATION_SENT_WAITING_RESPONSE,
CONFIGURATION_ACCEPTED,
}

View File

@@ -34,7 +34,7 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum DppStatusErrorCode {
UNKNOWN = -1,
UNKNOWN = (-1) /* -1 */,
SUCCESS = 0,
NOT_COMPATIBLE = 1,
AUTH_FAILURE = 2,

View File

@@ -34,12 +34,12 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum GroupCipherMask {
WEP40 = 2,
WEP104 = 4,
TKIP = 8,
CCMP = 16,
GTK_NOT_USED = 16384,
GCMP_256 = 256,
SMS4 = 128,
GCMP_128 = 64,
WEP40 = (1 << 1) /* 2 */,
WEP104 = (1 << 2) /* 4 */,
TKIP = (1 << 3) /* 8 */,
CCMP = (1 << 4) /* 16 */,
GTK_NOT_USED = (1 << 14) /* 16384 */,
GCMP_256 = (1 << 8) /* 256 */,
SMS4 = (1 << 7) /* 128 */,
GCMP_128 = (1 << 6) /* 64 */,
}

View File

@@ -34,7 +34,7 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum GroupMgmtCipherMask {
BIP_GMAC_128 = 2048,
BIP_GMAC_256 = 4096,
BIP_CMAC_256 = 8192,
BIP_GMAC_128 = (1 << 11) /* 2048 */,
BIP_GMAC_256 = (1 << 12) /* 4096 */,
BIP_CMAC_256 = (1 << 13) /* 8192 */,
}

View File

@@ -34,6 +34,6 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum IfaceType {
STA = 0,
P2P = 1,
STA,
P2P,
}

View File

@@ -34,6 +34,6 @@
package android.hardware.wifi.supplicant;
@Backing(type="byte") @VintfStability
enum IpVersion {
VERSION_4 = 0,
VERSION_6 = 1,
VERSION_4,
VERSION_6,
}

View File

@@ -34,21 +34,21 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum KeyMgmtMask {
WPA_EAP = 1,
WPA_PSK = 2,
NONE = 4,
IEEE8021X = 8,
FT_EAP = 32,
FT_PSK = 64,
OSEN = 32768,
WPA_EAP_SHA256 = 128,
WPA_PSK_SHA256 = 256,
SAE = 1024,
SUITE_B_192 = 131072,
OWE = 4194304,
DPP = 8388608,
WAPI_PSK = 4096,
WAPI_CERT = 8192,
FILS_SHA256 = 262144,
FILS_SHA384 = 524288,
WPA_EAP = (1 << 0) /* 1 */,
WPA_PSK = (1 << 1) /* 2 */,
NONE = (1 << 2) /* 4 */,
IEEE8021X = (1 << 3) /* 8 */,
FT_EAP = (1 << 5) /* 32 */,
FT_PSK = (1 << 6) /* 64 */,
OSEN = (1 << 15) /* 32768 */,
WPA_EAP_SHA256 = (1 << 7) /* 128 */,
WPA_PSK_SHA256 = (1 << 8) /* 256 */,
SAE = (1 << 10) /* 1024 */,
SUITE_B_192 = (1 << 17) /* 131072 */,
OWE = (1 << 22) /* 4194304 */,
DPP = (1 << 23) /* 8388608 */,
WAPI_PSK = (1 << 12) /* 4096 */,
WAPI_CERT = (1 << 13) /* 8192 */,
FILS_SHA256 = (1 << 18) /* 262144 */,
FILS_SHA384 = (1 << 19) /* 524288 */,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum OcspType {
NONE = 0,
REQUEST_CERT_STATUS = 1,
REQUIRE_CERT_STATUS = 2,
REQUIRE_ALL_CERTS_STATUS = 3,
NONE,
REQUEST_CERT_STATUS,
REQUIRE_CERT_STATUS,
REQUIRE_ALL_CERTS_STATUS,
}

View File

@@ -34,17 +34,17 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum P2pFrameTypeMask {
P2P_FRAME_PROBE_REQ_P2P = 1,
P2P_FRAME_PROBE_RESP_P2P = 2,
P2P_FRAME_PROBE_RESP_P2P_GO = 4,
P2P_FRAME_BEACON_P2P_GO = 8,
P2P_FRAME_P2P_PD_REQ = 16,
P2P_FRAME_P2P_PD_RESP = 32,
P2P_FRAME_P2P_GO_NEG_REQ = 64,
P2P_FRAME_P2P_GO_NEG_RESP = 128,
P2P_FRAME_P2P_GO_NEG_CONF = 256,
P2P_FRAME_P2P_INV_REQ = 512,
P2P_FRAME_P2P_INV_RESP = 1024,
P2P_FRAME_P2P_ASSOC_REQ = 2048,
P2P_FRAME_P2P_ASSOC_RESP = 4096,
P2P_FRAME_PROBE_REQ_P2P = (1 << 0) /* 1 */,
P2P_FRAME_PROBE_RESP_P2P = (1 << 1) /* 2 */,
P2P_FRAME_PROBE_RESP_P2P_GO = (1 << 2) /* 4 */,
P2P_FRAME_BEACON_P2P_GO = (1 << 3) /* 8 */,
P2P_FRAME_P2P_PD_REQ = (1 << 4) /* 16 */,
P2P_FRAME_P2P_PD_RESP = (1 << 5) /* 32 */,
P2P_FRAME_P2P_GO_NEG_REQ = (1 << 6) /* 64 */,
P2P_FRAME_P2P_GO_NEG_RESP = (1 << 7) /* 128 */,
P2P_FRAME_P2P_GO_NEG_CONF = (1 << 8) /* 256 */,
P2P_FRAME_P2P_INV_REQ = (1 << 9) /* 512 */,
P2P_FRAME_P2P_INV_RESP = (1 << 10) /* 1024 */,
P2P_FRAME_P2P_ASSOC_REQ = (1 << 11) /* 2048 */,
P2P_FRAME_P2P_ASSOC_RESP = (1 << 12) /* 4096 */,
}

View File

@@ -34,11 +34,11 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum P2pGroupCapabilityMask {
GROUP_OWNER = 1,
PERSISTENT_GROUP = 2,
GROUP_LIMIT = 4,
INTRA_BSS_DIST = 8,
CROSS_CONN = 16,
PERSISTENT_RECONN = 32,
GROUP_FORMATION = 64,
GROUP_OWNER = (1 << 0) /* 1 */,
PERSISTENT_GROUP = (1 << 1) /* 2 */,
GROUP_LIMIT = (1 << 2) /* 4 */,
INTRA_BSS_DIST = (1 << 3) /* 8 */,
CROSS_CONN = (1 << 4) /* 16 */,
PERSISTENT_RECONN = (1 << 5) /* 32 */,
GROUP_FORMATION = (1 << 6) /* 64 */,
}

View File

@@ -34,10 +34,10 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum PairwiseCipherMask {
NONE = 1,
TKIP = 8,
CCMP = 16,
GCMP_128 = 64,
SMS4 = 128,
GCMP_256 = 256,
NONE = (1 << 0) /* 1 */,
TKIP = (1 << 3) /* 8 */,
CCMP = (1 << 4) /* 16 */,
GCMP_128 = (1 << 6) /* 64 */,
SMS4 = (1 << 7) /* 128 */,
GCMP_256 = (1 << 8) /* 256 */,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum ProtoMask {
WPA = 1,
RSN = 2,
WAPI = 4,
OSEN = 8,
WPA = (1 << 0) /* 1 */,
RSN = (1 << 1) /* 2 */,
WAPI = (1 << 2) /* 4 */,
OSEN = (1 << 3) /* 8 */,
}

View File

@@ -34,12 +34,12 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum QosPolicyClassifierParamsMask {
SRC_IP = 1,
DST_IP = 2,
SRC_PORT = 4,
DST_PORT_RANGE = 8,
PROTOCOL_NEXT_HEADER = 16,
FLOW_LABEL = 32,
DOMAIN_NAME = 64,
DSCP = 128,
SRC_IP = (1 << 0) /* 1 */,
DST_IP = (1 << 1) /* 2 */,
SRC_PORT = (1 << 2) /* 4 */,
DST_PORT_RANGE = (1 << 3) /* 8 */,
PROTOCOL_NEXT_HEADER = (1 << 4) /* 16 */,
FLOW_LABEL = (1 << 5) /* 32 */,
DOMAIN_NAME = (1 << 6) /* 64 */,
DSCP = (1 << 7) /* 128 */,
}

View File

@@ -34,6 +34,6 @@
package android.hardware.wifi.supplicant;
@Backing(type="byte") @VintfStability
enum QosPolicyRequestType {
QOS_POLICY_ADD = 0,
QOS_POLICY_REMOVE = 1,
QOS_POLICY_ADD,
QOS_POLICY_REMOVE,
}

View File

@@ -19,8 +19,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum QosPolicyScsRequestStatusCode {
SENT = 0,
ALREADY_ACTIVE = 1,
NOT_EXIST = 2,
INVALID = 3,
SENT,
ALREADY_ACTIVE,
NOT_EXIST,
INVALID,
}

View File

@@ -19,13 +19,13 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum QosPolicyScsResponseStatusCode {
SUCCESS = 0,
TCLAS_REQUEST_DECLINED = 1,
TCLAS_NOT_SUPPORTED_BY_AP = 2,
TCLAS_INSUFFICIENT_RESOURCES = 3,
TCLAS_RESOURCES_EXHAUSTED = 4,
TCLAS_PROCESSING_TERMINATED_INSUFFICIENT_QOS = 5,
TCLAS_PROCESSING_TERMINATED_POLICY_CONFLICT = 6,
TCLAS_PROCESSING_TERMINATED = 7,
TIMEOUT = 8,
SUCCESS,
TCLAS_REQUEST_DECLINED,
TCLAS_NOT_SUPPORTED_BY_AP,
TCLAS_INSUFFICIENT_RESOURCES,
TCLAS_RESOURCES_EXHAUSTED,
TCLAS_PROCESSING_TERMINATED_INSUFFICIENT_QOS,
TCLAS_PROCESSING_TERMINATED_POLICY_CONFLICT,
TCLAS_PROCESSING_TERMINATED,
TIMEOUT,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="byte") @VintfStability
enum QosPolicyStatusCode {
QOS_POLICY_SUCCESS = 0,
QOS_POLICY_REQUEST_DECLINED = 1,
QOS_POLICY_CLASSIFIER_NOT_SUPPORTED = 2,
QOS_POLICY_INSUFFICIENT_RESOURCES = 3,
QOS_POLICY_SUCCESS,
QOS_POLICY_REQUEST_DECLINED,
QOS_POLICY_CLASSIFIER_NOT_SUPPORTED,
QOS_POLICY_INSUFFICIENT_RESOURCES,
}

View File

@@ -34,7 +34,7 @@
package android.hardware.wifi.supplicant;
@Backing(type="byte") @VintfStability
enum SaeH2eMode {
DISABLED = 0,
H2E_OPTIONAL = 1,
H2E_MANDATORY = 2,
DISABLED,
H2E_OPTIONAL,
H2E_MANDATORY,
}

View File

@@ -34,16 +34,16 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum SupplicantStatusCode {
SUCCESS = 0,
FAILURE_UNKNOWN = 1,
FAILURE_ARGS_INVALID = 2,
FAILURE_IFACE_INVALID = 3,
FAILURE_IFACE_UNKNOWN = 4,
FAILURE_IFACE_EXISTS = 5,
FAILURE_IFACE_DISABLED = 6,
FAILURE_IFACE_NOT_DISCONNECTED = 7,
FAILURE_NETWORK_INVALID = 8,
FAILURE_NETWORK_UNKNOWN = 9,
FAILURE_UNSUPPORTED = 10,
FAILURE_ONGOING_REQUEST = 11,
SUCCESS,
FAILURE_UNKNOWN,
FAILURE_ARGS_INVALID,
FAILURE_IFACE_INVALID,
FAILURE_IFACE_UNKNOWN,
FAILURE_IFACE_EXISTS,
FAILURE_IFACE_DISABLED,
FAILURE_IFACE_NOT_DISCONNECTED,
FAILURE_NETWORK_INVALID,
FAILURE_NETWORK_UNKNOWN,
FAILURE_UNSUPPORTED,
FAILURE_ONGOING_REQUEST,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum TlsVersion {
TLS_V1_0 = 0,
TLS_V1_1 = 1,
TLS_V1_2 = 2,
TLS_V1_3 = 3,
TLS_V1_0,
TLS_V1_1,
TLS_V1_2,
TLS_V1_3,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum TransitionDisableIndication {
USE_WPA3_PERSONAL = 1,
USE_SAE_PK = 2,
USE_WPA3_ENTERPRISE = 4,
USE_ENHANCED_OPEN = 8,
USE_WPA3_PERSONAL = (1 << 0) /* 1 */,
USE_SAE_PK = (1 << 1) /* 2 */,
USE_WPA3_ENTERPRISE = (1 << 2) /* 4 */,
USE_ENHANCED_OPEN = (1 << 3) /* 8 */,
}

View File

@@ -34,11 +34,11 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum WpaDriverCapabilitiesMask {
MBO = 1,
OCE = 2,
SAE_PK = 4,
WFD_R2 = 8,
TRUST_ON_FIRST_USE = 16,
SET_TLS_MINIMUM_VERSION = 32,
TLS_V1_3 = 64,
MBO = (1 << 0) /* 1 */,
OCE = (1 << 1) /* 2 */,
SAE_PK = (1 << 2) /* 4 */,
WFD_R2 = (1 << 3) /* 8 */,
TRUST_ON_FIRST_USE = (1 << 4) /* 16 */,
SET_TLS_MINIMUM_VERSION = (1 << 5) /* 32 */,
TLS_V1_3 = (1 << 6) /* 64 */,
}

View File

@@ -34,18 +34,18 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum WpsConfigMethods {
USBA = 1,
ETHERNET = 2,
LABEL = 4,
DISPLAY = 8,
EXT_NFC_TOKEN = 16,
INT_NFC_TOKEN = 32,
NFC_INTERFACE = 64,
PUSHBUTTON = 128,
KEYPAD = 256,
VIRT_PUSHBUTTON = 640,
PHY_PUSHBUTTON = 1152,
P2PS = 4096,
VIRT_DISPLAY = 8200,
PHY_DISPLAY = 16392,
USBA = 0x0001,
ETHERNET = 0x0002,
LABEL = 0x0004,
DISPLAY = 0x0008,
EXT_NFC_TOKEN = 0x0010,
INT_NFC_TOKEN = 0x0020,
NFC_INTERFACE = 0x0040,
PUSHBUTTON = 0x0080,
KEYPAD = 0x0100,
VIRT_PUSHBUTTON = 0x0280,
PHY_PUSHBUTTON = 0x0480,
P2PS = 0x1000,
VIRT_DISPLAY = 0x2008,
PHY_DISPLAY = 0x4008,
}

View File

@@ -34,12 +34,12 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum WpsDevPasswordId {
DEFAULT = 0,
USER_SPECIFIED = 1,
MACHINE_SPECIFIED = 2,
REKEY = 3,
PUSHBUTTON = 4,
REGISTRAR_SPECIFIED = 5,
NFC_CONNECTION_HANDOVER = 7,
P2PS_DEFAULT = 8,
DEFAULT = 0x0000,
USER_SPECIFIED = 0x0001,
MACHINE_SPECIFIED = 0x0002,
REKEY = 0x0003,
PUSHBUTTON = 0x0004,
REGISTRAR_SPECIFIED = 0x0005,
NFC_CONNECTION_HANDOVER = 0x0007,
P2PS_DEFAULT = 0x0008,
}

View File

@@ -34,7 +34,7 @@
package android.hardware.wifi.supplicant;
@Backing(type="int") @VintfStability
enum WpsProvisionMethod {
PBC = 0,
DISPLAY = 1,
KEYPAD = 2,
PBC,
DISPLAY,
KEYPAD,
}