mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:09:42 +00:00
Merge changes from topic "supplicant-fixed-size-arrays" into udc-dev
* changes: Use fixed-size arrays for any arrays added in V2 that expect a pre-set size. Disable linter in the Supplicant interface Android.bp file.
This commit is contained in:
committed by
Android (Google) Code Review
commit
ad659e2829
@@ -36,6 +36,11 @@ aidl_interface {
|
||||
"com.android.wifi",
|
||||
],
|
||||
min_sdk_version: "30",
|
||||
lint: {
|
||||
// Disable linter to avoid error about fixed size arrays.
|
||||
// Interface will only be accessed on devices >= T.
|
||||
enabled: false,
|
||||
},
|
||||
},
|
||||
ndk: {
|
||||
gen_trace: true,
|
||||
|
||||
@@ -38,6 +38,6 @@ parcelable MloLink {
|
||||
byte[] staLinkMacAddress;
|
||||
byte tidsUplinkMap;
|
||||
byte tidsDownlinkMap;
|
||||
@nullable byte[] apLinkMacAddress;
|
||||
@nullable byte[6] apLinkMacAddress;
|
||||
int frequencyMHz;
|
||||
}
|
||||
|
||||
@@ -36,5 +36,5 @@ package android.hardware.wifi.supplicant;
|
||||
parcelable MloLinksInfo {
|
||||
android.hardware.wifi.supplicant.MloLink[] links;
|
||||
int apMloLinkId;
|
||||
@nullable byte[] apMldMacAddress;
|
||||
@nullable byte[6] apMldMacAddress;
|
||||
}
|
||||
|
||||
@@ -41,8 +41,8 @@ parcelable P2pGroupStartedEventParams {
|
||||
byte[] psk;
|
||||
String passphrase;
|
||||
boolean isPersistent;
|
||||
byte[] goDeviceAddress;
|
||||
byte[] goInterfaceAddress;
|
||||
byte[6] goDeviceAddress;
|
||||
byte[6] goInterfaceAddress;
|
||||
boolean isP2pClientEapolIpAddressInfoPresent;
|
||||
android.hardware.wifi.supplicant.P2pClientEapolIpAddressInfo p2pClientIpInfo;
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
package android.hardware.wifi.supplicant;
|
||||
@VintfStability
|
||||
parcelable PmkSaCacheData {
|
||||
byte[] bssid;
|
||||
byte[6] bssid;
|
||||
long expirationTimeInSec;
|
||||
byte[] serializedEntry;
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ parcelable SupplicantStateChangeData {
|
||||
android.hardware.wifi.supplicant.StaIfaceCallbackState newState;
|
||||
int id;
|
||||
byte[] ssid;
|
||||
byte[] bssid;
|
||||
byte[6] bssid;
|
||||
android.hardware.wifi.supplicant.KeyMgmtMask keyMgmtMask;
|
||||
int frequencyMhz;
|
||||
boolean filsHlpSent;
|
||||
|
||||
@@ -61,7 +61,7 @@ parcelable MloLink {
|
||||
/**
|
||||
* AP Link MAC Address
|
||||
*/
|
||||
@nullable byte[/* 6 */] apLinkMacAddress;
|
||||
@nullable byte[6] apLinkMacAddress;
|
||||
/**
|
||||
* Frequency on which the link operates in MHz.
|
||||
*/
|
||||
|
||||
@@ -35,5 +35,5 @@ parcelable MloLinksInfo {
|
||||
/**
|
||||
* AP MLD MAC address.
|
||||
*/
|
||||
@nullable byte[/* 6 */] apMldMacAddress;
|
||||
@nullable byte[6] apMldMacAddress;
|
||||
}
|
||||
|
||||
@@ -45,10 +45,10 @@ parcelable P2pGroupStartedEventParams {
|
||||
boolean isPersistent;
|
||||
|
||||
/** MAC Address of the owner of this group. */
|
||||
byte[/* 6 */] goDeviceAddress;
|
||||
byte[6] goDeviceAddress;
|
||||
|
||||
/** MAC Address of the P2P interface of the owner of this group. */
|
||||
byte[/* 6 */] goInterfaceAddress;
|
||||
byte[6] goInterfaceAddress;
|
||||
|
||||
/**
|
||||
* Flag to indicate that the P2P Client IP address is allocated via EAPOL exchange.
|
||||
|
||||
@@ -24,7 +24,7 @@ parcelable PmkSaCacheData {
|
||||
/**
|
||||
* BSSID of the access point to which the station is associated.
|
||||
*/
|
||||
byte[/* 6 */] bssid;
|
||||
byte[6] bssid;
|
||||
/**
|
||||
* PMK expiration time in seconds.
|
||||
*/
|
||||
|
||||
@@ -46,7 +46,7 @@ parcelable SupplicantStateChangeData {
|
||||
* change event. This must be zero'ed if this event is not
|
||||
* specific to a particular network.
|
||||
*/
|
||||
byte[/* 6 */] bssid;
|
||||
byte[6] bssid;
|
||||
|
||||
/**
|
||||
* Currently used key mgmt mask.
|
||||
|
||||
Reference in New Issue
Block a user