diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-08 02:00:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 02:00:05 +0000 |
| commit | 38efe8eb08e08610d535a164768851ac7c13d654 (patch) | |
| tree | 7853a753cbfac471087604d702ad6b2c546a2269 /include | |
| parent | 4ee774f322ad3292fcfbb3c120cf250643419425 (diff) | |
| parent | 6db20dcb54dad932a3ea2e3a5dca41fce5802eb4 (diff) | |
| download | frameworks_av-38efe8eb08e08610d535a164768851ac7c13d654.zip frameworks_av-38efe8eb08e08610d535a164768851ac7c13d654.tar.gz frameworks_av-38efe8eb08e08610d535a164768851ac7c13d654.tar.bz2 | |
am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev
* commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4':
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 { |