summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaesung Chung2017-06-18 19:28:29 -0500
committerandroid-build-merger2017-06-18 19:28:29 -0500
commit43dd866e08638a5f21089caa3884497f39a7585a (patch)
tree023afa0e79b2902c347c18eef1a3b255068d07e8 /logd/tests
parent24e8e0d0d8054cd225aa092a0c208911dffe5809 (diff)
parentfe361ae7b3766d1d8e510ac605ae57f90df9a69c (diff)
downloadplatform-system-core-43dd866e08638a5f21089caa3884497f39a7585a.tar.gz
platform-system-core-43dd866e08638a5f21089caa3884497f39a7585a.tar.xz
platform-system-core-43dd866e08638a5f21089caa3884497f39a7585a.zip
Merge "logd-unit-tests: make sure use unsigned types when reading le" am: 31f2c81755 am: b9a1ff14ae
am: fe361ae7b3 Change-Id: I3b798c547772bf28f0ba00dfbf0a02b0712f9179
Diffstat (limited to 'logd/tests')
-rw-r--r--logd/tests/logd_test.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp
index cd802123e..4397b144c 100644
--- a/logd/tests/logd_test.cpp
+++ b/logd/tests/logd_test.cpp
@@ -933,8 +933,12 @@ TEST(logd, getEventTag_newentry) {
933} 933}
934 934
935#ifdef __ANDROID__ 935#ifdef __ANDROID__
936static inline int32_t get4LE(const char* src) { 936static inline uint32_t get4LE(const uint8_t* src) {
937 return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24); 937 return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
938}
939
940static inline uint32_t get4LE(const char* src) {
941 return get4LE(reinterpret_cast<const uint8_t*>(src));
938} 942}
939#endif 943#endif
940 944