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

Commit 92edc506 authored by Sunil Ravi's avatar Sunil Ravi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "Supplicant_AIDL_interface_V3" into main 

* changes:
  wifi: API to Notify the IP address of connected client
  wifi: Format Supplicant HAL files as a part of update API
  wifi: Update Supplicant HAL to V3
parents 1beaf588 246e87d0

compatibility_matrices/compatibility_matrix.9.xml

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.wifi.supplicant</name>

        <version>2</version>

        <version>2-3</version>

        <interface>

            <name>ISupplicant</name>

            <instance>default</instance>

wifi/supplicant/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,6 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,



}

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

+4 −4
Original line number Diff line number Diff line
@@ -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 */,

}

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

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

}

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

+8 −8
Original line number Diff line number Diff line
@@ -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 */,

}