commit | 4700f417a9c30288841f11463a49c0d161dbf217 | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Fri Oct 02 21:59:20 2015 -0700 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Fri Oct 02 21:59:20 2015 -0700 |
tree | aedd78405f1b39966f99e07e2879365605fb370f | |
parent | 2cb4b7565917249cefa7471e8fe02d7d7ceac99c [diff] | |
parent | f1f4743c8fa887b9769c89e8a08d4e8910722f31 [diff] |
Merge "hal: check offload_callback not NULL before calling"
diff --git a/hal/audio_hw.c b/hal/audio_hw.c index 1183db0..d1e41ee 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c
@@ -1354,7 +1354,7 @@ pthread_mutex_lock(&out->lock); out->offload_thread_blocked = false; pthread_cond_signal(&out->cond); - if (send_callback) { + if (send_callback && out->offload_callback) { ALOGVV("%s: sending offload_callback event %d", __func__, event); out->offload_callback(event, NULL, out->offload_cookie); }