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

Commit 465470a0 authored by Sujit Kautkar's avatar Sujit Kautkar
Browse files

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

Revert submission 20813956-issue-262873111-API-set-clusterId-newAPI

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=oriole-userdebug&lkgb=9469876&lkbb=9470237&fkbb=9469914, bug b/264915970

Reverted changes: /q/submissionid:20813956-issue-262873111-API-set-clusterId-newAPI

Bug: 264915970
Change-Id: Ifb3806a702f585700ce80a5979fdb2608b3d9eeb
parent f6abe359

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

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

  boolean supportsHe;

  boolean supportsPairing;

  boolean supportsSetClusterId;

}

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

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

  boolean enableInstantCommunicationMode;

  int instantModeChannel;

  int clusterId;

}

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

+0 −4
Original line number Diff line number Diff line
@@ -97,8 +97,4 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -60,8 +60,4 @@ 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

+0 −3
Original line number Diff line number Diff line
@@ -1706,8 +1706,6 @@ 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;

}
@@ -2247,7 +2245,6 @@ 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;

}