commit 3e98ecd18c906dc3ac2ff1a890f0b3163447272d
author Glenn Kasten <gkasten@google.com> Mon May 18 13:13:24 2015 -0700
committer Glenn Kasten <gkasten@google.com> Mon May 18 14:37:52 2015 -0700
tree 8c9227dcf79cd1d87d69d6c1ab4c66d440d3207c
parent 4a95e69406aa2e9896d865962d6d947ebbdac6fc

Clear mAudioRecord and mAudioTrack on set() failure

Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db

media/libmediaplayerservice/MediaPlayerService.cpp

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 @@
         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