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

Commit a7bdf7c7 authored by Biswarup Pal's avatar Biswarup Pal Committed by Android (Google) Code Review
Browse files

Merge "Add NAN suspension flag to NanCapabilities AIDL"

parents 5388757c 319f99f2

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

+1 −0
Original line number Diff line number Diff line
@@ -53,4 +53,5 @@ parcelable NanCapabilities { 
  boolean supportsHe;

  boolean supportsPairing;

  boolean supportsSetClusterId;

  boolean supportsSuspension;

}

wifi/aidl/android/hardware/wifi/NanCapabilities.aidl

+5 −1
Original line number Diff line number Diff line
@@ -98,7 +98,11 @@ parcelable NanCapabilities { 
     */

    boolean supportsPairing;

    /**

     * Flag to indicate if NAN setting cluster ID is supported.

     * Flag to indicate if setting NAN cluster ID is supported.

     */

    boolean supportsSetClusterId;

    /**

     * Flag to indicate if NAN suspension is supported.

     */

    boolean supportsSuspension;

}

wifi/aidl/default/aidl_struct_util.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2248,6 +2248,8 @@ bool convertLegacyNanCapabilitiesResponseToAidl(const legacy_hal::NanCapabilitie 
    aidl_response->supportsHe = legacy_response.is_he_supported;

    aidl_response->supportsPairing = legacy_response.is_pairing_supported;

    aidl_response->supportsSetClusterId = legacy_response.is_set_cluster_id_supported;

    aidl_response->supportsSuspension = legacy_response.is_suspension_supported;



    return true;

}