commit 48e5af7adf5559074564bd9280877571c747b520
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 09 20:49:44 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 09 20:49:44 2021 +0000
tree 6ab1dac45d0d8a791640e69286993b82af21645f
parent 1f10f72c4143a5aedd9dcaab6db33adb331f735e
parent 4162873eb7d59d3c7a53317b27c291932728d430

Merge "Audio policy: fix crash in absence of spatializer" into sc-v2-dev

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 8504489..dd91792 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -2224,8 +2224,11 @@
         media::GetSpatializerResponse* _aidl_return) {
     _aidl_return->spatializer = nullptr;
     LOG_ALWAYS_FATAL_IF(callback == nullptr);
-    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(mSpatializer->registerCallback(callback)));
-    _aidl_return->spatializer = mSpatializer;
+    if (mSpatializer != nullptr) {
+        RETURN_IF_BINDER_ERROR(
+                binderStatusFromStatusT(mSpatializer->registerCallback(callback)));
+        _aidl_return->spatializer = mSpatializer;
+    }
     return Status::ok();
 }