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

Commit bae6fddf authored by Nate Jiang's avatar Nate Jiang
Browse files

Modify based on the vendor feedback 

- Add end pairing request method
- Handle bootstrapping comeback event
- Add cipher type in the pairing request

Bug: 265075699
Test: cts sinlgeDeviceTest
Change-Id: Ic744b0a1098e258b68caba5a9a33b2bef3226b40
parent feec85fc

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

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ interface IWifiNanIface { 
  void respondToPairingIndicationRequest(in char cmdId, in android.hardware.wifi.NanRespondToPairingIndicationRequest msg);

  void initiateBootstrappingRequest(in char cmdId, in android.hardware.wifi.NanBootstrappingRequest msg);

  void respondToBootstrappingIndicationRequest(in char cmdId, in android.hardware.wifi.NanBootstrappingResponse msg);

  void terminatePairingRequest(in char cmdId, in int pairingInstanceId);

  const int MIN_DATA_PATH_CONFIG_PASSPHRASE_LENGTH = 8;

  const int MAX_DATA_PATH_CONFIG_PASSPHRASE_LENGTH = 63;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -70,4 +70,5 @@ interface IWifiNanIfaceEventCallback { 
  oneway void eventBootstrappingConfirm(in android.hardware.wifi.NanBootstrappingConfirmInd event);

  oneway void notifyInitiateBootstrappingResponse(in char id, in android.hardware.wifi.NanStatus status, in int bootstrappingInstanceId);

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

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

}

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 << 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),

    APF = (1 << 0) /* 1 */,

    BACKGROUND_SCAN = (1 << 1) /* 2 */,

    LINK_LAYER_STATS = (1 << 2) /* 4 */,

    RSSI_MONITOR = (1 << 3) /* 8 */,

    CONTROL_ROAMING = (1 << 4) /* 16 */,

    PROBE_IE_ALLOWLIST = (1 << 5) /* 32 */,

    SCAN_RAND = (1 << 6) /* 64 */,

    STA_5G = (1 << 7) /* 128 */,

    HOTSPOT = (1 << 8) /* 256 */,

    PNO = (1 << 9) /* 512 */,

    TDLS = (1 << 10) /* 1024 */,

    TDLS_OFFCHANNEL = (1 << 11) /* 2048 */,

    ND_OFFLOAD = (1 << 12) /* 4096 */,

    KEEP_ALIVE = (1 << 13) /* 8192 */,

    DEBUG_PACKET_FATE = (1 << 14) /* 16384 */,

  }

}

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

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ package android.hardware.wifi; 
@VintfStability

parcelable NanBootstrappingConfirmInd {

  int bootstrappingInstanceId;

  boolean acceptRequest;

  android.hardware.wifi.NanBootstrappingResponseCode responseCode;

  android.hardware.wifi.NanStatus reasonCode;

  int comeBackDelay;

  byte[] cookie;

}

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

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

@Backing(type="int") @VintfStability

enum NanBootstrappingMethod {

  BOOTSTRAPPING_OPPORTUNISTIC_MASK = (1 << 0),

  BOOTSTRAPPING_PIN_CODE_DISPLAY_MASK = (1 << 1),

  BOOTSTRAPPING_PASSPHRASE_DISPLAY_MASK = (1 << 2),

  BOOTSTRAPPING_QR_DISPLAY_MASK = (1 << 3),

  BOOTSTRAPPING_NFC_TAG_MASK = (1 << 4),

  BOOTSTRAPPING_PIN_CODE_KEYPAD_MASK = (1 << 5),

  BOOTSTRAPPING_PASSPHRASE_KEYPAD_MASK = (1 << 6),

  BOOTSTRAPPING_QR_SCAN_MASK = (1 << 7),

  BOOTSTRAPPING_NFC_READER_MASK = (1 << 8),

  BOOTSTRAPPING_SERVICE_MANAGED_MASK = (1 << 14),

  BOOTSTRAPPING_HANDSHAKE_SHIP_MASK = (1 << 15),

  BOOTSTRAPPING_OPPORTUNISTIC_MASK = (1 << 0) /* 1 */,

  BOOTSTRAPPING_PIN_CODE_DISPLAY_MASK = (1 << 1) /* 2 */,

  BOOTSTRAPPING_PASSPHRASE_DISPLAY_MASK = (1 << 2) /* 4 */,

  BOOTSTRAPPING_QR_DISPLAY_MASK = (1 << 3) /* 8 */,

  BOOTSTRAPPING_NFC_TAG_MASK = (1 << 4) /* 16 */,

  BOOTSTRAPPING_PIN_CODE_KEYPAD_MASK = (1 << 5) /* 32 */,

  BOOTSTRAPPING_PASSPHRASE_KEYPAD_MASK = (1 << 6) /* 64 */,

  BOOTSTRAPPING_QR_SCAN_MASK = (1 << 7) /* 128 */,

  BOOTSTRAPPING_NFC_READER_MASK = (1 << 8) /* 256 */,

  BOOTSTRAPPING_SERVICE_MANAGED_MASK = (1 << 14) /* 16384 */,

  BOOTSTRAPPING_HANDSHAKE_SHIP_MASK = (1 << 15) /* 32768 */,

}