From 4b8a5ccef9217c22ffabc449f7f0a920941e88b0 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 4 Dec 2014 10:08:45 -0800
Subject: libmedia: Fix crash seen while running CTS

 * setVolume was called while the track was being torn down during
   MediaPlayerFlakyNetworkTest

Change-Id: Icb965478644909511215c17db3cf2debba85a864
---
 media/libmedia/AudioTrack.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'media/libmedia/AudioTrack.cpp')

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 2d9fcf7..4a4df54 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -704,7 +704,7 @@ status_t AudioTrack::setVolume(float left, float right)
 
     mProxy->setVolumeLR(gain_minifloat_pack(gain_from_float(left), gain_from_float(right)));
 
-    if (isOffloaded_l()) {
+    if (isOffloaded_l() && mAudioTrack != NULL) {
         mAudioTrack->signal();
     }
     return NO_ERROR;
-- 
cgit v1.1