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

Commit bf6ce1a5 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "supplicant(interface): Correct the WFD info length" am: d51c8176 

am: f092ffbe

Change-Id: I9bcfb6f174f7387956bbec423175e39004235782
parents 1100f4e5 f092ffbe

wifi/supplicant/1.0/ISupplicantP2pIface.hal

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ interface ISupplicantP2pIface extends ISupplicantIface { 
   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

   *         |SupplicantStatusCode.FAILURE_IFACE_INVALID|

   */

  setWfdDeviceInfo(uint8_t[8] info) generates (SupplicantStatus status);

  setWfdDeviceInfo(uint8_t[6] info) generates (SupplicantStatus status);



  /**

   * Creates a NFC handover request message.

wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ interface ISupplicantP2pIfaceCallback { 
      MacAddress srcAddress, MacAddress p2pDeviceAddress,

      uint8_t[8] primaryDeviceType, string deviceName,

      bitfield<WpsConfigMethods> configMethods, uint8_t deviceCapabilities,

      bitfield<P2pGroupCapabilityMask> groupCapabilities, uint8_t[8] wfdDeviceInfo);

      bitfield<P2pGroupCapabilityMask> groupCapabilities, uint8_t[6] wfdDeviceInfo);



  /**

   * Used to indicate that a P2P device has been lost.

wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ class IfaceCallback : public ISupplicantP2pIfaceCallback { 
        const hidl_array<uint8_t, 8>& /* primaryDeviceType */,

        const hidl_string& /* deviceName */, uint16_t /* configMethods */,

        uint8_t /* deviceCapabilities */, uint32_t /* groupCapabilities */,

        const hidl_array<uint8_t, 8>& /* wfdDeviceInfo */) override {

        const hidl_array<uint8_t, 6>& /* wfdDeviceInfo */) override {

        return Void();

    }

    Return<void> onDeviceLost(