commit f20a4e9f84bbb8748f28ca326caeba7a9947a369
author Andy Hung <hunga@google.com> Mon Aug 15 19:10:34 2016 -0700
committer Andy Hung <hunga@google.com> Thu Oct 13 11:00:12 2016 -0700
tree 835aabaa4dadc25764381edd7048567bdc1dc2ab
parent 8922c251072bf338cd22b237a25ef55ba41cf9b8

AudioTrack: Fix timestamp restore

Test: Photos with BT on and off.
Bug: 29946998
Change-Id: I729590451126e180ee85e1ab3dee2a0b24f0572d

include/media/AudioTrack.h

diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 88c4e61..4e2b740 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -1056,6 +1056,10 @@
                                                     // after flush.
     int64_t                 mFramesWrittenServerOffset; // An offset to server frames due to
                                                     // restoring AudioTrack, or stop/start.
+                                                    // This offset is also used for static tracks.
+    int64_t                 mFramesWrittenAtRestore; // Frames written at restore point (or frames
+                                                    // delivered for static tracks).
+                                                    // -1 indicates no previous restore point.
 
     audio_output_flags_t    mFlags;                 // same as mOrigFlags, except for bits that may
                                                     // be denied by client or server, such as