Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VmsUtils.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VmsUtils.h
index 87010ce..f064367 100644
--- a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VmsUtils.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VmsUtils.h
@@ -172,7 +172,7 @@
// should first convert the proto to a byte string (vms_packet) using the
// SerializeToString proto API. Then, it use this interface to build the VehicleProperty
// by passing publisher and layer information (layer_publisher) and the vms_packet.
-std::unique_ptr<VehiclePropValue> CreateDataMessageWithLayerPublisherInfo(
+std::unique_ptr<VehiclePropValue> createDataMessageWithLayerPublisherInfo(
const VmsLayerAndPublisher& layer_publisher, const std::string& vms_packet);
// Creates a VehiclePropValue containing a message of type
diff --git a/automotive/vehicle/2.0/default/common/src/VmsUtils.cpp b/automotive/vehicle/2.0/default/common/src/VmsUtils.cpp
index f16489c..a5fcbaf 100644
--- a/automotive/vehicle/2.0/default/common/src/VmsUtils.cpp
+++ b/automotive/vehicle/2.0/default/common/src/VmsUtils.cpp
@@ -126,7 +126,7 @@
return result;
}
-std::unique_ptr<VehiclePropValue> CreateDataMessageWithLayerPublisherInfo(
+std::unique_ptr<VehiclePropValue> createDataMessageWithLayerPublisherInfo(
const VmsLayerAndPublisher& layer_publisher, const std::string& vms_packet) {
auto result = createBaseVmsMessage(kMessageTypeSize + kLayerAndPublisherSize);
result->value.int32Values = hidl_vec<int32_t>{
diff --git a/automotive/vehicle/2.0/default/tests/VmsUtils_test.cpp b/automotive/vehicle/2.0/default/tests/VmsUtils_test.cpp
index 8a434c8..3716738 100644
--- a/automotive/vehicle/2.0/default/tests/VmsUtils_test.cpp
+++ b/automotive/vehicle/2.0/default/tests/VmsUtils_test.cpp
@@ -141,7 +141,7 @@
TEST(VmsUtilsTest, dataMessage) {
const std::string bytes = "aaa";
const VmsLayerAndPublisher layer_and_publisher(VmsLayer(2, 0, 1), 123);
- auto message = CreateDataMessageWithLayerPublisherInfo(layer_and_publisher, bytes);
+ auto message = createDataMessageWithLayerPublisherInfo(layer_and_publisher, bytes);
ASSERT_NE(message, nullptr);
EXPECT_TRUE(isValidVmsMessage(*message));
EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
@@ -177,7 +177,7 @@
TEST(VmsUtilsTest, parseDataMessage) {
const std::string bytes = "aaa";
const VmsLayerAndPublisher layer_and_publisher(VmsLayer(1, 0, 1), 123);
- auto message = CreateDataMessageWithLayerPublisherInfo(layer_and_publisher, bytes);
+ auto message = createDataMessageWithLayerPublisherInfo(layer_and_publisher, bytes);
auto data_str = parseData(*message);
ASSERT_FALSE(data_str.empty());
EXPECT_EQ(data_str, bytes);