commit | 995ce272c33f3a1d178a41e04e70eb6d55a34d5b | [log] [tgz] |
---|---|---|
author | Pawan Wagh <waghpawan@google.com> | Wed Feb 01 23:59:42 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 01 23:59:42 2023 +0000 |
tree | b7638f653a2d023aa1c15ac9448720b3490b6433 | |
parent | 878824fb9e598b69f3ecdb27a86bda0cd8148499 [diff] | |
parent | f784df7ccad44d13874afb75dfd0596692eb3051 [diff] |
Merge "Fixing null deference crash in audio service" am: f784df7cca Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2412574 Change-Id: I43bf49f7d13b09622c467e4c423ae512541d41a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/Module.cpp b/audio/aidl/default/Module.cpp index 82d1ef8..905ff2c 100644 --- a/audio/aidl/default/Module.cpp +++ b/audio/aidl/default/Module.cpp
@@ -953,7 +953,7 @@ } ndk::ScopedAStatus Module::getMicrophones(std::vector<MicrophoneInfo>* _aidl_return) { - *_aidl_return = mConfig->microphones; + *_aidl_return = getConfig().microphones; LOG(DEBUG) << __func__ << ": returning " << ::android::internal::ToString(*_aidl_return); return ndk::ScopedAStatus::ok(); }