commit bf24de292afd24c288e5522f1d0082c9fb7ec268
author Chad Brubaker <cbrubaker@google.com> Mon Nov 09 20:50:34 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 09 20:50:34 2015 +0000
tree 3f20d076ef4068334f06aca4dfedad4bd0c2bf6a
parent 67629cae43da7c4c2b1659fd6f245419b2e1c655
parent 7095f876565f8c52bafe02e7c6ba04aa0c274dfa

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

* commit '7095f876565f8c52bafe02e7c6ba04aa0c274dfa':
  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);