commit d01cbef73def767423f6f43358e593da1993c0d0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 01 06:30:58 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 01 06:30:58 2022 +0000
tree 6850befb84d6cff7c8dd3cfd00bead7653093e10
parent 601057b6fda9da3cf60d76a35ba40f4bfd881e29
parent 39842475fb41c38acd838411e7c3a0dee078e147

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

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

Change-Id: I4b8bb429d9cc23ae332b1a7d1e0a6f419756093a
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 66bd1c1..05f27b0 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -2353,6 +2353,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;
     }