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

Commit db51ab9d authored by Sherri Lin's avatar Sherri Lin Committed by Android (Google) Code Review
Browse files

Merge "[Aware] Support set cluster id in AIDL"

parents 2d286785 f6abe359

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

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

  boolean supportsHe;

  boolean supportsPairing;

  boolean supportsSetClusterId;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ parcelable NanConfigRequestSupplemental { 
  boolean enableRanging;

  boolean enableInstantCommunicationMode;

  int instantModeChannel;

  int clusterId;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -97,4 +97,8 @@ parcelable NanCapabilities { 
     * Flag to indicate if NAN pairing is supported.

     */

    boolean supportsPairing;

    /**

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

     */

    boolean supportsSetClusterId;

}

wifi/aidl/android/hardware/wifi/NanConfigRequestSupplemental.aidl

+4 −0
Original line number Diff line number Diff line
@@ -60,4 +60,8 @@ parcelable NanConfigRequestSupplemental { 
     * Controls which channel NAN instant communication mode operates on.

     */

    int instantModeChannel;

    /**

     * Controls which cluster to join.

     */

    int clusterId;

}

wifi/aidl/default/aidl_struct_util.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,8 @@ bool convertAidlNanConfigRequestToLegacy(const NanConfigRequest& aidl_request1, 
    legacy_request->enable_instant_mode = aidl_request2.enableInstantCommunicationMode;

    legacy_request->config_instant_mode_channel = 1;

    legacy_request->instant_mode_channel = aidl_request2.instantModeChannel;

    legacy_request->config_cluster_id = 1;

    legacy_request->cluster_id_val = aidl_request2.clusterId;



    return true;

}
@@ -2245,6 +2247,7 @@ bool convertLegacyNanCapabilitiesResponseToAidl(const legacy_hal::NanCapabilitie 
    aidl_response->supports6g = legacy_response.is_6g_supported;

    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;

    return true;

}