aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungjae Yoo <seungjaeyoo@google.com>2023-04-27 17:25:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-27 17:25:01 +0000
commit9a75d9aeacc8c00d990a106e514f18d9c2f64d64 (patch)
tree6cacacb741f140ece7156d836ed1ef91a4bace5e
parentfdacb0c62e6fa450c6ddd961091a8be2c0ec43e6 (diff)
parent03e8402ea0f49bffa27d5029737a27f5b4d53fcf (diff)
downloadwmediumd-9a75d9aeacc8c00d990a106e514f18d9c2f64d64.tar.gz
Merge "Add station_count field into WmediumdService ListStations" am: aed623b43b am: 836b695815 am: 03e8402ea0
Original change: https://android-review.googlesource.com/c/platform/external/wmediumd/+/2567151 Change-Id: Ice0d5c0695963918ca1befbf35127e6453202bce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--wmediumd_server/wmediumd.proto3
-rw-r--r--wmediumd_server/wmediumd_server.cc1
2 files changed, 3 insertions, 1 deletions
diff --git a/wmediumd_server/wmediumd.proto b/wmediumd_server/wmediumd.proto
index 4404931..fe354b5 100644
--- a/wmediumd_server/wmediumd.proto
+++ b/wmediumd_server/wmediumd.proto
@@ -42,7 +42,8 @@ message StationInfo {
}
message ListStationsResponse {
- repeated StationInfo stations = 1;
+ int32 station_count = 1;
+ repeated StationInfo stations = 2;
}
message LoadConfigRequest {
diff --git a/wmediumd_server/wmediumd_server.cc b/wmediumd_server/wmediumd_server.cc
index 6a22e90..3c72c01 100644
--- a/wmediumd_server/wmediumd_server.cc
+++ b/wmediumd_server/wmediumd_server.cc
@@ -129,6 +129,7 @@ class WmediumdServiceImpl final : public WmediumdService::Service {
const auto* response_data_payload =
reinterpret_cast<const wmediumd_station_infos*>(
&response_message.data_payload);
+ response->set_station_count(response_data_payload->count);
for (uint32_t i = 0; i < response_data_payload->count; ++i) {
const auto* station = reinterpret_cast<const wmediumd_station_info*>(
&response_data_payload->stations[i]);