From 0a60d071599ddaf7345b58a06f78bbb2dd152488 Mon Sep 17 00:00:00 2001 From: Sujit Kautkar Date: Mon, 9 Jan 2023 20:59:09 +0000 Subject: [PATCH] Revert "[Aware] Add paramters in NanConfigRequest to support set..." 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: I59be92a57e6c6086b9a652bf19adf4391fc4d2d8 --- include/hardware_legacy/wifi_nan.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/hardware_legacy/wifi_nan.h b/include/hardware_legacy/wifi_nan.h index 35feebd..bceb717 100644 --- a/include/hardware_legacy/wifi_nan.h +++ b/include/hardware_legacy/wifi_nan.h @@ -445,7 +445,6 @@ typedef struct { bool is_6g_supported; bool is_he_supported; bool is_pairing_supported; - bool is_set_cluster_id_supported; } NanCapabilities; /* @@ -1657,11 +1656,6 @@ typedef struct { */ u8 config_instant_mode_channel; wifi_channel instant_mode_channel; - /* - Config cluster ID with the cluster ID selected over NFC/OOB method. - */ - u8 config_cluster_id; - u16 cluster_id_val; // default value 0x0 } NanConfigRequest; /*