| commit | 3e22bd071cc2ed70135f7b36ade284c1f16a2b0a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 18 22:43:37 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 18 22:43:37 2021 +0000 |
| tree | 41b98e7daa11112c4267daf2c4bc85fef230a392 | |
| parent | 8380400e436b88ac732094c87f44f2020b136b91 [diff] | |
| parent | a47f2a3eb8275fb52a2ebd3ad527d6166f374b77 [diff] |
Merge "uwb: Change readme.txt to README.md"
diff --git a/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp b/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp index d5f2373..c742db5 100644 --- a/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp +++ b/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/test/proto_message_converter_test.cpp
@@ -45,7 +45,7 @@ std::vector<aidl_vehicle::VehiclePropValue> prepareTestValues() { std::vector<aidl_vehicle::VehiclePropValue> values; - long timestamp = 1; + int64_t timestamp = 1; for (auto& property : defaultconfig::getDefaultConfigs()) { values.push_back({ .timestamp = timestamp,
diff --git a/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h b/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h index 981088a..58531b9 100644 --- a/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h +++ b/automotive/vehicle/aidl/impl/hardware/include/IVehicleHardware.h
@@ -39,7 +39,7 @@ // A request type for 'setValues' or 'getValues' method. struct VehiclePropValueRequest { // A unique request ID set by the sender. - int requestId; + int64_t requestId; // The property to get/set. ::aidl::android::hardware::automotive::vehicle::VehiclePropValue value; };