diff options
| author | Scott Randolph <randolphs@google.com> | 2017-04-06 20:09:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-06 20:09:56 +0000 |
| commit | 796507cf83de7c46e22722396d3210f98278ffe2 (patch) | |
| tree | ddf1f56c1b417f9f468e63dd4bc51be6641e852f /sensors | |
| parent | 4cb19c55b5d336a0cdbc584d8c4b240d1abe8f3e (diff) | |
| parent | 0070a334b0502f99dc99fb0aa0e4c2c21a25a734 (diff) | |
| download | android_hardware_interfaces-796507cf83de7c46e22722396d3210f98278ffe2.tar.gz android_hardware_interfaces-796507cf83de7c46e22722396d3210f98278ffe2.tar.bz2 android_hardware_interfaces-796507cf83de7c46e22722396d3210f98278ffe2.zip | |
Merge "Use explicit .c_str() for hidl_string" into oc-dev am: f059ae420d
am: 0070a334b0
Change-Id: I13e2e0d1ad1fd596bb5ebf6694816b41332840d8
Diffstat (limited to 'sensors')
| -rw-r--r-- | sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp index a65c7b86a..14c4a2a34 100644 --- a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp +++ b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp @@ -616,7 +616,7 @@ void SensorsHidlTest::assertTypeMatchStringType(SensorType type, const hidl_stri switch (type) { #define CHECK_TYPE_STRING_FOR_SENSOR_TYPE(type) \ - case SensorType::type: ASSERT_STREQ(SENSOR_STRING_TYPE_ ## type, stringType); break; + case SensorType::type: ASSERT_STREQ(SENSOR_STRING_TYPE_ ## type, stringType.c_str()); break; CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ACCELEROMETER); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ACCELEROMETER_UNCALIBRATED); CHECK_TYPE_STRING_FOR_SENSOR_TYPE(ADDITIONAL_INFO); |