summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-05-18 13:13:24 -0700
committerGlenn Kasten <gkasten@google.com>2015-05-18 14:37:52 -0700
commit3e98ecd18c906dc3ac2ff1a890f0b3163447272d (patch)
tree8c9227dcf79cd1d87d69d6c1ab4c66d440d3207c /media/libmediaplayerservice/MediaPlayerService.cpp
parent4a95e69406aa2e9896d865962d6d947ebbdac6fc (diff)
downloadframeworks_av-3e98ecd18c906dc3ac2ff1a890f0b3163447272d.zip
frameworks_av-3e98ecd18c906dc3ac2ff1a890f0b3163447272d.tar.gz
frameworks_av-3e98ecd18c906dc3ac2ff1a890f0b3163447272d.tar.bz2
Clear mAudioRecord and mAudioTrack on set() failure
Bug: 20818955 Bug: 20890069 Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 891a9e9..efbc0d6 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1628,6 +1628,7 @@ status_t MediaPlayerService::AudioOutput::open(
if ((t == 0) || (t->initCheck() != NO_ERROR)) {
ALOGE("Unable to create audio track");
delete newcbd;
+ // t goes out of scope, so reference count drops to zero
return NO_INIT;
} else {
// successful AudioTrack initialization implies a legacy stream type was generated