From 465d8d7de27d0718074c949ff405c386e3f69082 Mon Sep 17 00:00:00 2001 From: terryguan Date: Wed, 21 Aug 2024 13:17:12 -0700 Subject: [PATCH] Add refreshPropertyConfigs to DumpResult proto refreshPropertyConfigs was not previously used in dumpresult proto resulting in failing tests that require the argument. Flag: EXEMPT test Bug: 357135536 Test: atest android.car.apitest.CarPropertyManagerTest Change-Id: I9c6dd3053aa54f37786edc3810a9342f5efb39cd --- automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.cpp | 1 + automotive/vehicle/aidl/impl/grpc/GRPCVehicleProxyServer.cpp | 1 + .../proto/android/hardware/automotive/vehicle/DumpResult.proto | 2 ++ 3 files changed, 4 insertions(+) diff --git a/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.cpp b/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.cpp index 201ddb0eef..875037524d 100644 --- a/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.cpp +++ b/automotive/vehicle/aidl/impl/grpc/GRPCVehicleHardware.cpp @@ -276,6 +276,7 @@ DumpResult GRPCVehicleHardware::dump(const std::vector& options) { return { .callerShouldDumpState = protoDumpResult.caller_should_dump_state(), .buffer = protoDumpResult.buffer(), + .refreshPropertyConfigs = protoDumpResult.refresh_property_configs(), }; } diff --git a/automotive/vehicle/aidl/impl/grpc/GRPCVehicleProxyServer.cpp b/automotive/vehicle/aidl/impl/grpc/GRPCVehicleProxyServer.cpp index d7cbe1b017..7697c03d74 100644 --- a/automotive/vehicle/aidl/impl/grpc/GRPCVehicleProxyServer.cpp +++ b/automotive/vehicle/aidl/impl/grpc/GRPCVehicleProxyServer.cpp @@ -226,6 +226,7 @@ GrpcVehicleProxyServer::GrpcVehicleProxyServer(std::vector serverAd auto dumpResult = mHardware->dump(dumpOptionStrings); result->set_caller_should_dump_state(dumpResult.callerShouldDumpState); result->set_buffer(dumpResult.buffer); + result->set_refresh_property_configs(dumpResult.refreshPropertyConfigs); return ::grpc::Status::OK; } diff --git a/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/DumpResult.proto b/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/DumpResult.proto index 25bb7d4f77..fbfb505f51 100644 --- a/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/DumpResult.proto +++ b/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/DumpResult.proto @@ -25,4 +25,6 @@ message DumpResult { bool caller_should_dump_state = 1; /* The dumped information for the caller to print. */ string buffer = 2; + /* To pass if DefaultVehicleHal should refresh the property configs. */ + bool refresh_property_configs = 3; }