summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2015-06-13 01:52:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-13 01:52:51 +0000
commit0907d87dca62cd5bc12d26892c411b7140d148b0 (patch)
treea940141ccc51b5b84028e0627bf747cda2e6f1f4 /services/audioflinger
parentefabeff16f479924547136bb88ee295fea718183 (diff)
parent4c6afaf1053ecbfda6d95098e0f49772ecbcf2e1 (diff)
downloadframeworks_av-0907d87dca62cd5bc12d26892c411b7140d148b0.zip
frameworks_av-0907d87dca62cd5bc12d26892c411b7140d148b0.tar.gz
frameworks_av-0907d87dca62cd5bc12d26892c411b7140d148b0.tar.bz2
Merge "Fix AudioRecord cleanup if construction fails" into mnc-dev
Diffstat (limited to 'services/audioflinger')
-rw-r--r--services/audioflinger/Tracks.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 1b03060..f7da209 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -1951,7 +1951,9 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack(
((buffer == NULL) ? ALLOC_LOCAL : ALLOC_NONE),
type),
mOverflow(false),
- mFramesToDrop(0)
+ mFramesToDrop(0),
+ mResamplerBufferProvider(NULL), // initialize in case of early constructor exit
+ mRecordBufferConverter(NULL)
{
if (mCblk == NULL) {
return;