commit b11b7fe1b13e8e0e98f376f28767bd2dee31beb7
author Shunkai Yao <yaoshunkai@google.com> Wed Sep 06 21:54:08 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Thu Sep 07 21:25:09 2023 +0000
tree 2970bd02472e5a12883ebff1a0969c24a511127e
parent 6999bc03e98ddf2950ee1b5485c4c07ab871e74f

Add AIDL union tag checking before access

And improve some parameter logging

Bug: 296954124
Test: Enable AIDL and test with YTM on Pixel
Change-Id: Ic3373a138b8aa02d6c283342b48765ba909855de

media/libaudiohal/impl/EffectConversionHelperAidl.h

diff --git a/media/libaudiohal/impl/EffectConversionHelperAidl.h b/media/libaudiohal/impl/EffectConversionHelperAidl.h
index 85e877e..17ff944 100644
--- a/media/libaudiohal/impl/EffectConversionHelperAidl.h
+++ b/media/libaudiohal/impl/EffectConversionHelperAidl.h
@@ -72,6 +72,11 @@
 
     static constexpr int kDefaultframeCount = 0x100;
 
+    template <typename T, typename = std::enable_if_t<std::is_arithmetic_v<T>>>
+    static inline std::string numericPointerToString(T* pt) {
+        return pt ? std::to_string(*pt) : "nullptr";
+    }
+
     using AudioChannelLayout = aidl::android::media::audio::common::AudioChannelLayout;
     const aidl::android::media::audio::common::AudioConfig kDefaultAudioConfig = {
             .base = {.sampleRate = 44100,