commit 4c39b9c74224782a6ceb299554f4abc9e1cf5733
author Chih-Hung Hsieh <chh@google.com> Fri May 27 11:38:26 2016 -0700
committer Chih-Hung Hsieh <chh@google.com> Fri May 27 11:38:26 2016 -0700
tree 36615ae0cfaa565987875be2995d528d5445317f
parent f69feffd84bc736a8cdee7902bfcf988409af7c1
parent 9764d5292bcd936ff2442de69371913f88489189

resolve merge conflicts of 9764d52 to nyc-dev-plus-aosp

Change-Id: I52d001d9dff4b250769e5fa59f9aea461b435193

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 1963da3..e8c3466 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -2499,7 +2499,7 @@
     // This is sometimes caused by erratic reports of the available space in the ALSA drivers.
     if (status == NO_ERROR) {
         if (previousTimestampValid) {
-#define TIME_TO_NANOS(time) ((int64_t)time.tv_sec * 1000000000 + time.tv_nsec)
+#define TIME_TO_NANOS(time) ((int64_t)(time).tv_sec * 1000000000 + (time).tv_nsec)
             const int64_t previousTimeNanos = TIME_TO_NANOS(mPreviousTimestamp.mTime);
             const int64_t currentTimeNanos = TIME_TO_NANOS(timestamp.mTime);
 #undef TIME_TO_NANOS