summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-03-08 06:23:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-08 06:23:51 +0000
commitf566406a48ecf878d8a0034b6c600d42454d264c (patch)
treea565bcb6139569d15dbc2ec616820e448c74b7ff /include
parent6950d10077d10757e894d8e125ba5111eb02517a (diff)
parent6db20dcb54dad932a3ea2e3a5dca41fce5802eb4 (diff)
downloadframeworks_av-f566406a48ecf878d8a0034b6c600d42454d264c.zip
frameworks_av-f566406a48ecf878d8a0034b6c600d42454d264c.tar.gz
frameworks_av-f566406a48ecf878d8a0034b6c600d42454d264c.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.h1
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 {