summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-09-13 17:50:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-13 17:50:31 -0700
commit3f0c821740305c352eb355ba3d72906a7a97751c (patch)
tree37e771ac039d0b0578bc7266ea9122771edf7c99 /include/media
parentd4fdc0f5621098d89c686a0edbfc22247005c46c (diff)
parent7e8626fd7580dc5e0d4b4e4ceef0988067b60037 (diff)
downloadframeworks_base-3f0c821740305c352eb355ba3d72906a7a97751c.zip
frameworks_base-3f0c821740305c352eb355ba3d72906a7a97751c.tar.gz
frameworks_base-3f0c821740305c352eb355ba3d72906a7a97751c.tar.bz2
Merge "Issue 5298399: Lost speech after a crash in gTalk."
Diffstat (limited to 'include/media')
-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 923518d..d1a8105 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -486,6 +486,7 @@ private:
int mSessionId;
int mAuxEffectId;
Mutex mLock;
+ status_t mRestoreStatus;
};