commit 39842475fb41c38acd838411e7c3a0dee078e147
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 01 05:37:33 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 01 05:37:33 2022 +0000
tree 96ad20632207cb5e0ac671af034e92d7542f91ac
parent eec8e1b65a6008a6e162d027bc4dfeee3d059cdc
parent 903ee4c00c6867c71f85b952ce1770eccfdfd891

Merge "Fix arguments checking in AudioSystem::canBeSpatialized" am: 07b03bd0ac am: 708fdc1f00 am: 5ff6518830 am: 903ee4c00c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2201455

Change-Id: I5ae81cb9805db29fd1021dd3c018ad749bee3c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 965c40f..141e1e3 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -2339,6 +2339,9 @@
                                     const AudioDeviceTypeAddrVector &devices,
                                     bool *canBeSpatialized) {
     const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
+    if (canBeSpatialized == nullptr) {
+        return BAD_VALUE;
+    }
     if (aps == 0) {
         return PERMISSION_DENIED;
     }