Snap for 11853759 from 0725c98f6e to 25D4-release

Change-Id: I46eca9de8c1137a0cf254d68ecf61ebb5ac5b5a1
This commit is contained in:
Android Build Coastguard Worker 2024-05-17 01:03:49 +00:00
commit 20dd5c126e
4 changed files with 67 additions and 58 deletions

View file

@ -55,12 +55,10 @@ sync from ag/26090783, need remove before submit.
<point>100,-1800</point> <point>100,-1800</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point> <point>1,-5000</point>
<point>29,-3400</point> <point>33,-3500</point>
<point>57,-2250</point> <point>66,-2400</point>
<point>71,-1900</point> <point>100,-1600</point>
<point>86,-1530</point>
<point>100,-1100</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -72,11 +70,8 @@ sync from ag/26090783, need remove before submit.
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4000</point> <point>1,-4000</point>
<point>29,-2950</point> <point>33,-2400</point>
<point>43,-2350</point> <point>66,-1200</point>
<point>57,-1850</point>
<point>71,-1400</point>
<point>86,-700</point>
<point>100,0</point> <point>100,0</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -88,31 +83,30 @@ sync from ag/26090783, need remove before submit.
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/> ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-9000</point> <point>1,-6589</point>
<point>4,-6370</point> <point>8,-5971</point>
<point>8,-6105</point> <point>12,-5619</point>
<point>12,-5810</point> <point>16,-5212</point>
<point>16,-5520</point> <point>20,-4833</point>
<point>20,-5220</point> <point>24,-4434</point>
<point>24,-4870</point> <point>28,-4141</point>
<point>28,-4490</point> <point>32,-3856</point>
<point>32,-4278</point> <point>36,-3611</point>
<point>36,-4027</point> <point>40,-3382</point>
<point>40,-3770</point> <point>44,-3143</point>
<point>44,-3560</point> <point>48,-2921</point>
<point>48,-3300</point> <point>52,-2695</point>
<point>52,-3080</point> <point>56,-2497</point>
<point>56,-2800</point> <point>60,-2308</point>
<point>60,-2620</point> <point>64,-2109</point>
<point>64,-2350</point> <point>68,-1893</point>
<point>68,-2200</point> <point>72,-1706</point>
<point>72,-2100</point> <point>76,-1474</point>
<point>76,-1930</point> <point>80,-1224</point>
<point>80,-1700</point> <point>84,-1000</point>
<point>84,-1460</point> <point>88,-786</point>
<point>88,-1190</point> <point>92,-581</point>
<point>92,-850</point> <point>96,-275</point>
<point>96,-510</point>
<point>100,0</point> <point>100,0</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -124,11 +118,9 @@ sync from ag/26090783, need remove before submit.
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/> ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>0,-5600</point> <point>0,-4000</point>
<point>29,-3520</point> <point>33,-2400</point>
<point>57,-1500</point> <point>66,-1200</point>
<point>71,-1150</point>
<point>86,-500</point>
<point>100,0</point> <point>100,0</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -140,11 +132,10 @@ sync from ag/26090783, need remove before submit.
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point> <point>1,-4800</point>
<point>29,-3800</point> <point>33,-2400</point>
<point>71,-1850</point> <point>66,-1200</point>
<point>86,-1000</point> <point>100,0</point>
<point>100,-500</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@ -181,12 +172,10 @@ sync from ag/26090783, need remove before submit.
<point>100,-1800</point> <point>100,-1800</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point> <point>1,-5000</point>
<point>29,-3400</point> <point>33,-3500</point>
<point>57,-2250</point> <point>66,-2400</point>
<point>71,-1900</point> <point>100,-1600</point>
<point>86,-1530</point>
<point>100,-1100</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -201,12 +190,10 @@ sync from ag/26090783, need remove before submit.
<point>100,-1800</point> <point>100,-1800</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-5700</point> <point>1,-6000</point>
<point>29,-4230</point> <point>33,-3000</point>
<point>43,-3300</point> <point>66,-2200</point>
<point>57,-3100</point> <point>100,-1600</point>
<point>71,-2500</point>
<point>100,-1400</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

View file

@ -55,6 +55,8 @@
<ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="55"/> <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="55"/>
<ctl name="TAS25XX ASI Switch" value="0"/> <ctl name="TAS25XX ASI Switch" value="0"/>
<ctl name="TAS25XX CODEC PROFILE" value="default"/> <ctl name="TAS25XX CODEC PROFILE" value="default"/>
<ctl name="TAS25XX EM LEFT" value="NG_ME_ON"/>
<ctl name="TAS25XX EM RIGHT" value="NG_ME_ON"/>
<!-- HAC Max Amp switch init --> <!-- HAC Max Amp switch init -->
<ctl name="HAC AMP EN" value="0" /> <ctl name="HAC AMP EN" value="0" />
@ -1213,6 +1215,8 @@
<ctl name="TAS25XX CODEC PROFILE" value="voice"/> <ctl name="TAS25XX CODEC PROFILE" value="voice"/>
<ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="55"/> <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="55"/>
<ctl name="TAS25XX ASI Switch" value="1"/> <ctl name="TAS25XX ASI Switch" value="1"/>
<ctl name="TAS25XX EM LEFT" value="OFF"/>
<ctl name="TAS25XX EM RIGHT" value="OFF"/>
</path> </path>
<path name="speaker-earpiece (VOICE,HAC)"> <path name="speaker-earpiece (VOICE,HAC)">
@ -1220,6 +1224,8 @@
<ctl name="TAS25XX ASI Switch" value="1"/> <ctl name="TAS25XX ASI Switch" value="1"/>
<ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="58"/> <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="58"/>
<ctl name="HAC AMP EN" value="1" /> <ctl name="HAC AMP EN" value="1" />
<ctl name="TAS25XX EM LEFT" value="OFF"/>
<ctl name="TAS25XX EM RIGHT" value="OFF"/>
</path> </path>
<path name="speaker"> <path name="speaker">
@ -1230,6 +1236,8 @@
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
<ctl name="TAS25XX CODEC PROFILE" value="music_17dB_stereo"/> <ctl name="TAS25XX CODEC PROFILE" value="music_17dB_stereo"/>
<ctl name="TAS25XX ASI Switch" value="1"/> <ctl name="TAS25XX ASI Switch" value="1"/>
<ctl name="TAS25XX EM LEFT" value="OFF"/>
<ctl name="TAS25XX EM RIGHT" value="OFF"/>
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">

View file

@ -159,4 +159,16 @@
<!-- boolean indicating whether the caller thread needs to wait for destroyed listeners --> <!-- boolean indicating whether the caller thread needs to wait for destroyed listeners -->
<bool translatable="false" name ="config_wifiWaitForDestroyedListeners">true</bool> <bool translatable="false" name ="config_wifiWaitForDestroyedListeners">true</bool>
<!-- Boolean indicating performing a partial initial scan is enabled -->
<bool translatable="false" name="config_wifiEnablePartialInitialScan">true</bool>
<!-- Configure the max number of new channels to add into the initial partial scan list per network.
If equals to 0, it means there's no limit on the max number of channels to include per network.-->
<integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
<!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
true: firmware roaming will be disabled when the device goes into idle mode, and then
re-activated when the device exits idle mode.
false: firmware roaming will not be affected. -->
<bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
</resources> </resources>

View file

@ -26,3 +26,5 @@ include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
include device/google/tegu-sepolicy/tegu-sepolicy.mk include device/google/tegu-sepolicy/tegu-sepolicy.mk
include device/google/tegu/wifi/BoardConfig-wifi.mk include device/google/tegu/wifi/BoardConfig-wifi.mk
WITH_DEXPREOPT := false