commit 7095f876565f8c52bafe02e7c6ba04aa0c274dfa
author Chad Brubaker <cbrubaker@google.com> Mon Nov 09 20:47:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 09 20:47:32 2015 +0000
tree 39909871faf202fa16848eb57c8f28a2d36b927d
parent 74e0f3a620bd0cdfb153728e99a17a96ca3db0de
parent 51cd9a441ed0acf6e3b9c221e9b7f9424073191f

Merge "Whitelist getTimestamp from integer sanitization"
am: 51cd9a441e

* commit '51cd9a441ed0acf6e3b9c221e9b7f9424073191f':
  Whitelist getTimestamp from integer sanitization

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 66c8ad3..82b6736 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -2197,6 +2197,7 @@
     return mAudioTrack->setParameters(keyValuePairs);
 }
 
+__attribute__((no_sanitize("integer")))
 status_t AudioTrack::getTimestamp(AudioTimestamp& timestamp)
 {
     AutoMutex lock(mLock);