Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad659e28 authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

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.
parents ae2a9242 da640d66

wifi/supplicant/aidl/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -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,

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/MloLink.aidl

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ parcelable MloLink { 
  byte[] staLinkMacAddress;

  byte tidsUplinkMap;

  byte tidsDownlinkMap;

  @nullable byte[] apLinkMacAddress;

  @nullable byte[6] apLinkMacAddress;

  int frequencyMHz;

}

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/MloLinksInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/P2pGroupStartedEventParams.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/PmkSaCacheData.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.wifi.supplicant;

@VintfStability

parcelable PmkSaCacheData {

  byte[] bssid;

  byte[6] bssid;

  long expirationTimeInSec;

  byte[] serializedEntry;

}