commit 8c6161382fc602322f5eefe8c88f50f79b612b85
author Chad Brubaker <cbrubaker@google.com> Mon Nov 09 20:53:51 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 09 20:53:51 2015 +0000
tree fc5f8e42a23865305168906995eb89057781de4f
parent a1f03967caf8036b6b928155dbc4a9696c465353
parent bf24de292afd24c288e5522f1d0082c9fb7ec268

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

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