diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-08 00:29:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-08 00:29:56 +0000 |
| commit | 6db20dcb54dad932a3ea2e3a5dca41fce5802eb4 (patch) | |
| tree | 295ef5012f98e4b9251f28774cfb3f83710ea197 /include/media | |
| parent | 2f55c2c03b17795e94b325d402ac5b409e3ba0e8 (diff) | |
| parent | 2048c2292c0466b184fb8f67c91f4d0ab9f5c3f3 (diff) | |
| download | frameworks_av-6db20dcb54dad932a3ea2e3a5dca41fce5802eb4.zip frameworks_av-6db20dcb54dad932a3ea2e3a5dca41fce5802eb4.tar.gz frameworks_av-6db20dcb54dad932a3ea2e3a5dca41fce5802eb4.tar.bz2 | |
Merge "AudioTrack: When paused, return cached playback position" into klp-dev
Diffstat (limited to 'include/media')
| -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 { |