Evolution-X-Tensor/device_google_tangorpro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 9196024 from 6ef3b8c238 to udc-release

Browse source 
Change-Id: Idb8646e55d5d6a916c3cebc764d8d99e35ddf2f0
This commit is contained in:
Android Build Coastguard Worker 2022-10-20 01:03:13 +00:00
commit b006bf9e35
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/tangorpro/config/audio_platform_configuration.xml
View file

@ -292,7 +292,7 @@
<external_module> <external_module>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4"/>
<module libname="audio_spk_35l41.so" argu="SpeakerNum=4"/> <module libname="audio_spk_35l41.so" argu="SpeakerNum=4,Rotation"/>
<module libname="audio_fortemedia_aoc.so" argu="RTN_SUP=y DOCK_CHARGER_MONITOR=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2"/> <module libname="audio_fortemedia_aoc.so" argu="RTN_SUP=y DOCK_CHARGER_MONITOR=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/> <module libname="audio_amcs_ext.so"/>

22
audio/tangorpro/config/mixer_paths.xml
View file

@ -109,13 +109,13 @@
<ctl name="L2 DSP1 Firmware" value="Protection"/> <ctl name="L2 DSP1 Firmware" value="Protection"/>
<ctl name="R2 DSP1 Firmware" value="Protection"/> <ctl name="R2 DSP1 Firmware" value="Protection"/>
<ctl name="DSP RX1 Source" value="ASPRX1"/> <ctl name="DSP RX1 Source" value="ASPRX1"/>
<ctl name="DSP RX2 Source" value="ASPRX1"/> <ctl name="DSP RX2 Source" value="ASPRX2"/>
<ctl name="R DSP RX1 Source" value="ASPRX1"/> <ctl name="R DSP RX1 Source" value="ASPRX1"/>
<ctl name="R DSP RX2 Source" value="ASPRX1"/> <ctl name="R DSP RX2 Source" value="ASPRX2"/>
<ctl name="L2 DSP RX1 Source" value="ASPRX1"/> <ctl name="L2 DSP RX1 Source" value="ASPRX1"/>
<ctl name="L2 DSP RX2 Source" value="ASPRX1"/> <ctl name="L2 DSP RX2 Source" value="ASPRX2"/>
<ctl name="R2 DSP RX1 Source" value="ASPRX1"/> <ctl name="R2 DSP RX1 Source" value="ASPRX1"/>
<ctl name="R2 DSP RX2 Source" value="ASPRX1"/> <ctl name="R2 DSP RX2 Source" value="ASPRX2"/>
<ctl name="Boost Peak Current Limit" value="3.50A"/> <ctl name="Boost Peak Current Limit" value="3.50A"/>
<ctl name="R Boost Peak Current Limit" value="3.50A"/> <ctl name="R Boost Peak Current Limit" value="3.50A"/>
<ctl name="L2 Boost Peak Current Limit" value="3.50A"/> <ctl name="L2 Boost Peak Current Limit" value="3.50A"/>
@ -923,6 +923,20 @@
<ctl name="MIC Record Soft Gain (dB)" value="0"/> <ctl name="MIC Record Soft Gain (dB)" value="0"/>
</path> </path>
<!-- cs35l41 specific path for rotation start -->
<path name="cs35l41-rotation-0">
</path>
<path name="cs35l41-rotation-90">
</path>
<path name="cs35l41-rotation-180">
</path>
<path name="cs35l41-rotation-270">
</path>
<!-- cs35l41 specific path for rotation end -->
<!-- cs35l41 specific path to load firmware in cs35l41.c --> <!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start"> <path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware--> <!-- Enable it after get the protection firmware-->

3
cast_auth/mediadrm/DrmPlugin.cpp
View file

@ -116,6 +116,7 @@ std::vector<uint8_t> readBinaryFile(const std::string& file_path) {
*_aidl_return = std::vector<uint8_t>(); *_aidl_return = std::vector<uint8_t>();
void* cast_auth_handle = ::dlopen("libcast_auth.so", RTLD_LAZY); void* cast_auth_handle = ::dlopen("libcast_auth.so", RTLD_LAZY);
if (!cast_auth_handle) { if (!cast_auth_handle) {
ALOGE("Fail to get TA for signing");
return toNdkScopedAStatus(status); return toNdkScopedAStatus(status);
} }
typedef bool (*func_type)(const std::vector<uint8_t>&, typedef bool (*func_type)(const std::vector<uint8_t>&,
@ -123,6 +124,7 @@ std::vector<uint8_t> readBinaryFile(const std::string& file_path) {
func_type sign_hash_func = func_type sign_hash_func =
reinterpret_cast<func_type>(::dlsym(cast_auth_handle, "SignHash")); reinterpret_cast<func_type>(::dlsym(cast_auth_handle, "SignHash"));
if (!sign_hash_func) { if (!sign_hash_func) {
ALOGE("Fail to apply signing method");
dlclose(cast_auth_handle); dlclose(cast_auth_handle);
return toNdkScopedAStatus(status); return toNdkScopedAStatus(status);
} }
@ -133,6 +135,7 @@ std::vector<uint8_t> readBinaryFile(const std::string& file_path) {
*_aidl_return = signature; *_aidl_return = signature;
status = Status::OK; status = Status::OK;
} }
ALOGE("Get empty result from TA");
return toNdkScopedAStatus(status); return toNdkScopedAStatus(status);
} }