commit 3e9dd76e813cf04c9dd35a8c2e813c174e5b435e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 02 21:36:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 02 21:36:24 2019 +0000
tree b7bb9f627d7ff277676aac2dd61da2ed5b72fc2d
parent b5ba1eb0a07c35fa4d5596b3e2dae5dfba39a9b6
parent 5b023ebc681f8b41da3a862d161453931a01704f

Merge "audiopolicy: add null pointer check for primary hw"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index f1d29a2..5b4ad22 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -472,6 +472,10 @@
     std::unordered_set<audio_format_t> formatSet;
     sp<HwModule> primaryModule =
             mHwModules.getModuleFromName(AUDIO_HARDWARE_MODULE_ID_PRIMARY);
+    if (primaryModule == nullptr) {
+        ALOGE("%s() unable to get primary module", __func__);
+        return NO_INIT;
+    }
     DeviceVector declaredDevices = primaryModule->getDeclaredDevices().getDevicesFromTypeMask(
             AUDIO_DEVICE_OUT_ALL_A2DP);
     for (const auto& device : declaredDevices) {