| commit | 1e07474110eee778a9ff52f2ab2eccd3e58a68f9 | [log] [tgz] |
|---|---|---|
| author | Pawan Wagh <waghpawan@google.com> | Thu Feb 02 00:51:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 02 00:51:15 2023 +0000 |
| tree | d87851e6640117aeebfb1f26354d6a254c4ee3ab | |
| parent | d0eb7cb4426d5dc9ac93ba6cccaa5af761198a3d [diff] | |
| parent | 8b984c5e72ea721a44adce7847dd4a05ef3c7fdc [diff] |
Merge "Fixing null deference crash in audio service" am: f784df7cca am: 995ce272c3 am: 8b984c5e72 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2412574 Change-Id: I89e35ed2fa649d0a43782c0c6b5be4ee7ec58272 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(); }