RESTRICT AUTOMERGE: Revert "audio: add HIDL SoundDose libraries & framework config"

This reverts commit 44b202b946. For AK3
1st launch we will go 50332-2 LAB certification.

Bug: 315887200
Change-Id: If4542a7e78bb6eab682c9b5b488197a361dea65f
This commit is contained in:
vincenttew 2024-01-02 20:21:47 +08:00 committed by Carter Hsu
parent d103b42e6d
commit 74daa18933
3 changed files with 0 additions and 8 deletions

View file

@ -279,8 +279,6 @@
--> -->
<string name="config_mainDisplayShape" translatable="false">M 96.5,0.09 C 91.13,0.36 82.7,1.63 79.38,2.34 59.53,6.58 50.35,10.97 39.94,18.2 27.73,26.69 16.6,39.86 10.5,52.79 6.41,61.47 2.37,75.03 1.22,83.76 0.14,91.99 0.31,92.14 0.09,96.34 V 2307.68 l 1.59,11.48 c 4.89,22.96 11.89,37.01 25.55,51.29 13.95,14.57 29.8,22.8 53.75,27.88 l 11.5,1.59 H 987.52 l 11.5,-1.59 c 23.95,-5.08 39.8,-13.31 53.75,-27.88 13.66,-14.27 20.66,-28.33 25.55,-51.29 l 1.59,-11.48 V 96.34 c -0.23,-4.2 -0.05,-4.34 -1.13,-12.57 -1.15,-8.73 -5.19,-22.3 -9.28,-30.98 C 1063.4,39.86 1052.27,26.69 1040.06,18.2 1029.65,10.97 1020.47,6.58 1000.62,2.34 997.3,1.63 988.87,0.36 983.5,0.09 Z</string> <string name="config_mainDisplayShape" translatable="false">M 96.5,0.09 C 91.13,0.36 82.7,1.63 79.38,2.34 59.53,6.58 50.35,10.97 39.94,18.2 27.73,26.69 16.6,39.86 10.5,52.79 6.41,61.47 2.37,75.03 1.22,83.76 0.14,91.99 0.31,92.14 0.09,96.34 V 2307.68 l 1.59,11.48 c 4.89,22.96 11.89,37.01 25.55,51.29 13.95,14.57 29.8,22.8 53.75,27.88 l 11.5,1.59 H 987.52 l 11.5,-1.59 c 23.95,-5.08 39.8,-13.31 53.75,-27.88 13.66,-14.27 20.66,-28.33 25.55,-51.29 l 1.59,-11.48 V 96.34 c -0.23,-4.2 -0.05,-4.34 -1.13,-12.57 -1.15,-8.73 -5.19,-22.3 -9.28,-30.98 C 1063.4,39.86 1052.27,26.69 1040.06,18.2 1029.65,10.97 1020.47,6.58 1000.62,2.34 997.3,1.63 988.87,0.36 983.5,0.09 Z</string>
<bool name="config_safe_sound_dosage_enabled">true</bool>
<!-- The max vibration strength allowed in audio haptic channels. --> <!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.32</item> <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.32</item>

View file

@ -303,7 +303,6 @@
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
<module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/> <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/> <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
<module libname="audio_sounddose_aoc.so"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>

View file

@ -246,11 +246,6 @@ PRODUCT_PACKAGES += \
libspatialaudio \ libspatialaudio \
librondo librondo
# Sound Dose
PRODUCT_PACKAGES += \
android.hardware.audio.sounddose-vendor-impl \
audio_sounddose_aoc \
# Audio CCA property # Audio CCA property
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false persist.vendor.audio.cca.enabled=false