commit a33c8e8e7a4ac2f2fc28c7619c54d493c6f4b1ad
author Chih-Hung Hsieh <chh@google.com> Tue Dec 11 22:28:07 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Dec 11 22:28:07 2018 -0800
tree 16a71cc1a2b5eac481297c390dee722ba32e7609
parent 7dd8e82fce48f92c6344a88be8b821ac135d0c37
parent f9eee4612bdcf32e3202c4e4aeffca84fea23cd8

Merge "Fix cert-dcl16-c clang-tidy warnings in include." am: fc3c56fb85
am: f9eee4612b

Change-Id: Ic413cb25a56764cdf0b1af0c92e33ebd766d75c4

include/media/VolumeShaper.h

diff --git a/include/media/VolumeShaper.h b/include/media/VolumeShaper.h
index a3aaece..79afd6c 100644
--- a/include/media/VolumeShaper.h
+++ b/include/media/VolumeShaper.h
@@ -551,7 +551,7 @@
 
     static int64_t convertTimespecToUs(const struct timespec &tv)
     {
-        return tv.tv_sec * 1000000ll + tv.tv_nsec / 1000;
+        return tv.tv_sec * 1000000LL + tv.tv_nsec / 1000;
     }
 
     // current monotonic time in microseconds.