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

Commit e97e9c78 authored by Phill Hayers's avatar Phill Hayers Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nan_suspension_hal" 

* changes:
  Add NAN session suspension in shim layer.
  Add AIDL definitions for NAN suspension.
parents ea59abe6 02a97247

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIface.aidl

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ interface IWifiNanIface { 
  void stopPublishRequest(in char cmdId, in byte sessionId);

  void stopSubscribeRequest(in char cmdId, in byte sessionId);

  void terminateDataPathRequest(in char cmdId, in int ndpInstanceId);

  void suspendRequest(in char cmdId, in byte sessionId);

  void resumeRequest(in char cmdId, in byte sessionId);

  void transmitFollowupRequest(in char cmdId, in android.hardware.wifi.NanTransmitFollowupRequest msg);

  void initiatePairingRequest(in char cmdId, in android.hardware.wifi.NanPairingRequest msg);

  void respondToPairingIndicationRequest(in char cmdId, in android.hardware.wifi.NanRespondToPairingIndicationRequest msg);

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ interface IWifiNanIfaceEventCallback { 
  oneway void notifyStopPublishResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void notifyStopSubscribeResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void notifyTerminateDataPathResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void notifySuspendResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void notifyResumeResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void notifyTransmitFollowupResponse(in char id, in android.hardware.wifi.NanStatus status);

  oneway void eventPairingRequest(in android.hardware.wifi.NanPairingRequestInd event);

  oneway void eventPairingConfirm(in android.hardware.wifi.NanPairingConfirmInd event);

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl

+15 −15
Original line number Diff line number Diff line
@@ -64,20 +64,20 @@ interface IWifiStaIface { 
  void setDtimMultiplier(in int multiplier);

  @Backing(type="int") @VintfStability

  enum StaIfaceCapabilityMask {

    APF = 1,

    BACKGROUND_SCAN = 2,

    LINK_LAYER_STATS = 4,

    RSSI_MONITOR = 8,

    CONTROL_ROAMING = 16,

    PROBE_IE_ALLOWLIST = 32,

    SCAN_RAND = 64,

    STA_5G = 128,

    HOTSPOT = 256,

    PNO = 512,

    TDLS = 1024,

    TDLS_OFFCHANNEL = 2048,

    ND_OFFLOAD = 4096,

    KEEP_ALIVE = 8192,

    DEBUG_PACKET_FATE = 16384,

    APF = (1 << 0),

    BACKGROUND_SCAN = (1 << 1),

    LINK_LAYER_STATS = (1 << 2),

    RSSI_MONITOR = (1 << 3),

    CONTROL_ROAMING = (1 << 4),

    PROBE_IE_ALLOWLIST = (1 << 5),

    SCAN_RAND = (1 << 6),

    STA_5G = (1 << 7),

    HOTSPOT = (1 << 8),

    PNO = (1 << 9),

    TDLS = (1 << 10),

    TDLS_OFFCHANNEL = (1 << 11),

    ND_OFFLOAD = (1 << 12),

    KEEP_ALIVE = (1 << 13),

    DEBUG_PACKET_FATE = (1 << 14),

  }

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceConcurrencyType.aidl

+5 −5
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
package android.hardware.wifi;

@Backing(type="int") @VintfStability

enum IfaceConcurrencyType {

  STA = 0,

  AP = 1,

  AP_BRIDGED = 2,

  P2P = 3,

  NAN_IFACE = 4,

  STA,

  AP,

  AP_BRIDGED,

  P2P,

  NAN_IFACE,

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceType.aidl

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
package android.hardware.wifi;

@Backing(type="int") @VintfStability

enum IfaceType {

  STA = 0,

  AP = 1,

  P2P = 2,

  NAN_IFACE = 3,

  STA,

  AP,

  P2P,

  NAN_IFACE,

}