diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-08 02:03:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 02:03:09 +0000 |
| commit | 3a20f9af8587d2e5bbf4654a3a958f43c4133445 (patch) | |
| tree | 80cd4642fe95200e8dc68d7cba241e594ced4816 /include | |
| parent | 77a85ebe1fc28f3af07ebefeea53fad778f442c0 (diff) | |
| parent | 38efe8eb08e08610d535a164768851ac7c13d654 (diff) | |
| download | frameworks_av-3a20f9af8587d2e5bbf4654a3a958f43c4133445.zip frameworks_av-3a20f9af8587d2e5bbf4654a3a958f43c4133445.tar.gz frameworks_av-3a20f9af8587d2e5bbf4654a3a958f43c4133445.tar.bz2 | |
am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev
* commit '38efe8eb08e08610d535a164768851ac7c13d654':
AudioTrack: When paused, return cached playback position
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index f6646ab..4736369 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -740,6 +740,7 @@ protected: bool mInUnderrun; // whether track is currently in underrun state String8 mName; // server's name for this IAudioTrack + uint32_t mPausedPosition; private: class DeathNotifier : public IBinder::DeathRecipient { |