diff options
| author | Steve Kondik <steve@cyngn.com> | 2014-12-04 10:08:45 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-23 12:38:46 -0500 |
| commit | 4b8a5ccef9217c22ffabc449f7f0a920941e88b0 (patch) | |
| tree | 39dc52f340ff299c9c1f954a391aef67515b4ce5 /media/libmedia/AudioTrack.cpp | |
| parent | 31b46eb4fec33d2c91c0629290a7a5f1b1d652b8 (diff) | |
| download | frameworks_av-4b8a5ccef9217c22ffabc449f7f0a920941e88b0.zip frameworks_av-4b8a5ccef9217c22ffabc449f7f0a920941e88b0.tar.gz frameworks_av-4b8a5ccef9217c22ffabc449f7f0a920941e88b0.tar.bz2 | |
libmedia: Fix crash seen while running CTS
* setVolume was called while the track was being torn down during
MediaPlayerFlakyNetworkTest
Change-Id: Icb965478644909511215c17db3cf2debba85a864
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |