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

Android 15.0.0 Release 20 (BP1A.250305.019)

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo7QAKCRDorT+BmrEO
 eADVAJ9i5qvn9t1SPUQWjAvproy/hLr+aACfUDZs9l708nXyOOvtti/CzgwHepM=
 =qYEh
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN SSH SIGNATURE-----
 U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ
 +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
 AAAAQPC1fb6zXDL2EesHyxiBJhc8HoSpuTol+YLlaPOZXo4ynAhzR8+dlciGYaL+Ww7+wL
 X+vg13Lt4e33exl7G8mQg=
 -----END SSH SIGNATURE-----

Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20

Android 15.0.0 Release 20 (BP1A.250305.019)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo7QAKCRDorT+BmrEO
# eADVAJ9i5qvn9t1SPUQWjAvproy/hLr+aACfUDZs9l708nXyOOvtti/CzgwHepM=
# =qYEh
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar  5 03:29:17 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By David Chao (2) and others
# Via Android Build Coastguard Worker (26) and others
* tag 'android-15.0.0_r20': (31 commits)
  Add a way to disable auto prefer fit for launch.
  audio: align volume curve
  Revert "shusky/haptics: Remove voltage restriction for haptics"
  shusky: Remove dbc properties for fw 7.2.81.
  shusky/haptics: Remove voltage restriction for haptics
  PowerHint: Refine FIXED_PERFORMANCE mode CPU Frequencies
  Revert "thermal: Add JSON Schema Checker"
  Add Samsung Galaxy Buds 3 pro to the LE audio allow list
  Revert "powerhint: enable auto_prefer_idle in games"
  bt: add bthal service permission to access bt wakelock control device node
  Enable bthal service recovery by restart
  shusky: add microphone info for aidl hal.
  Disable Wifi BugReport for subsystem restart
  thermal: update thermal config
  [NFC] Enable STNFC_ACTIVERW_TIMER
  Remove 'RELEASE_PIXEL_BROADCAST_ENABLED'
  Enable CDPreferHighCap for CAMERA_STREAMING_HIGH
  16k: Move BoardConfig-shusky-common.mk to device/google/zuma/BoardConfig-16k-common.mk
  16kb: Set 16kb TARGET_ vars in BoardConfig files and targets
  16kb: Use PRODUCT_BOOTS_16K to select the kernel and fs
  ...

 Conflicts:
	device-shiba.mk

Change-Id: Ie8e2f9868571ceb82493d471171498cb88c82063
This commit is contained in:
Michael Bestas 2025-03-09 11:05:09 +02:00
commit 685486a876
27 changed files with 1100 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

1
aosp_husky_pgagnostic.mk
View file

@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_RW_FILE_SYSTEM_TYPE := ext4
TARGET_BOOTS_16K := true TARGET_BOOTS_16K := true

1
aosp_shiba_pgagnostic.mk
View file

@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_RW_FILE_SYSTEM_TYPE := ext4
TARGET_BOOTS_16K := true TARGET_BOOTS_16K := true

206
audio/husky/aidl_config/audio_platform_configuration.xml
View file

@ -107,6 +107,212 @@
</enablement> </enablement>
</spatialCapture> </spatialCapture>
<microphones>
<microphone id="builtin_mic_1" location="MAINBODY" group="0" indexInTheGroup="0"
directionality="OMNI">
<device type="IN_MICROPHONE" address="bottom" />
<sensitivity levelDbfs="37.0" maxSplDb="132.5" minSplDb="28.5" />
<position x="0.0269" y="0.0058" z="0.0079" />
<orientation x="0.0" y="0.0" z="1.0" />
<frequencyResponse>
<point frequencyHz="100.00" levelDb="-0.78" />
<point frequencyHz="106.00" levelDb="-0.71" />
<point frequencyHz="112.00" levelDb="-0.64" />
<point frequencyHz="118.00" levelDb="-0.60" />
<point frequencyHz="125.00" levelDb="-0.55" />
<point frequencyHz="132.00" levelDb="-0.50" />
<point frequencyHz="140.00" levelDb="-0.47" />
<point frequencyHz="150.00" levelDb="-0.42" />
<point frequencyHz="160.00" levelDb="-0.39" />
<point frequencyHz="170.00" levelDb="-0.36" />
<point frequencyHz="180.00" levelDb="-0.34" />
<point frequencyHz="190.00" levelDb="-0.33" />
<point frequencyHz="200.00" levelDb="-0.32" />
<point frequencyHz="212.00" levelDb="-0.29" />
<point frequencyHz="224.00" levelDb="-0.28" />
<point frequencyHz="236.00" levelDb="-0.28" />
<point frequencyHz="250.00" levelDb="-0.27" />
<point frequencyHz="265.00" levelDb="-0.25" />
<point frequencyHz="280.00" levelDb="-0.25" />
<point frequencyHz="300.00" levelDb="-0.24" />
<point frequencyHz="315.00" levelDb="-0.23" />
<point frequencyHz="335.00" levelDb="-0.23" />
<point frequencyHz="355.00" levelDb="-0.22" />
<point frequencyHz="375.00" levelDb="-0.22" />
<point frequencyHz="400.00" levelDb="-0.19" />
<point frequencyHz="425.00" levelDb="-0.17" />
<point frequencyHz="450.00" levelDb="-0.15" />
<point frequencyHz="475.00" levelDb="-0.15" />
<point frequencyHz="500.00" levelDb="-0.14" />
<point frequencyHz="530.00" levelDb="-0.14" />
<point frequencyHz="560.00" levelDb="-0.12" />
<point frequencyHz="600.00" levelDb="-0.11" />
<point frequencyHz="630.00" levelDb="-0.10" />
<point frequencyHz="670.00" levelDb="-0.10" />
<point frequencyHz="710.00" levelDb="-0.08" />
<point frequencyHz="750.00" levelDb="-0.07" />
<point frequencyHz="800.00" levelDb="-0.07" />
<point frequencyHz="850.00" levelDb="-0.04" />
<point frequencyHz="900.00" levelDb="-0.03" />
<point frequencyHz="950.00" levelDb="-0.01" />
<point frequencyHz="1000.00" levelDb="0.00" />
<point frequencyHz="1060.00" levelDb="0.04" />
<point frequencyHz="1120.00" levelDb="0.06" />
<point frequencyHz="1180.00" levelDb="0.07" />
<point frequencyHz="1250.00" levelDb="0.08" />
<point frequencyHz="1320.00" levelDb="0.13" />
<point frequencyHz="1400.00" levelDb="0.09" />
<point frequencyHz="1500.00" levelDb="0.14" />
<point frequencyHz="1600.00" levelDb="0.19" />
<point frequencyHz="1700.00" levelDb="0.23" />
<point frequencyHz="1800.00" levelDb="0.28" />
<point frequencyHz="1900.00" levelDb="0.29" />
<point frequencyHz="2000.00" levelDb="0.31" />
<point frequencyHz="2120.00" levelDb="0.37" />
<point frequencyHz="2240.00" levelDb="0.88" />
<point frequencyHz="2360.00" levelDb="0.86" />
<point frequencyHz="2500.00" levelDb="0.77" />
<point frequencyHz="2650.00" levelDb="0.78" />
<point frequencyHz="2800.00" levelDb="0.84" />
<point frequencyHz="3000.00" levelDb="0.86" />
<point frequencyHz="3150.00" levelDb="1.05" />
<point frequencyHz="3350.00" levelDb="1.12" />
<point frequencyHz="3550.00" levelDb="1.18" />
<point frequencyHz="3750.00" levelDb="1.25" />
<point frequencyHz="4000.00" levelDb="1.43" />
<point frequencyHz="4250.00" levelDb="1.66" />
<point frequencyHz="4500.00" levelDb="1.83" />
<point frequencyHz="4750.00" levelDb="2.02" />
<point frequencyHz="5000.00" levelDb="2.23" />
<point frequencyHz="5300.00" levelDb="2.59" />
<point frequencyHz="5600.00" levelDb="2.84" />
<point frequencyHz="6000.00" levelDb="3.35" />
<point frequencyHz="6300.00" levelDb="4.01" />
<point frequencyHz="6700.00" levelDb="6.82" />
<point frequencyHz="7100.00" levelDb="6.62" />
<point frequencyHz="7500.00" levelDb="6.42" />
<point frequencyHz="8000.00" levelDb="7.30" />
<point frequencyHz="8500.00" levelDb="8.23" />
<point frequencyHz="9000.00" levelDb="7.54" />
<point frequencyHz="9500.00" levelDb="12.68" />
<point frequencyHz="10000.00" levelDb="13.76" />
<point frequencyHz="10600.00" levelDb="18.69" />
<point frequencyHz="11200.00" levelDb="19.68" />
<point frequencyHz="11800.00" levelDb="20.90" />
<point frequencyHz="12500.00" levelDb="23.70" />
<point frequencyHz="13200.00" levelDb="25.10" />
<point frequencyHz="14000.00" levelDb="21.65" />
<point frequencyHz="15000.00" levelDb="16.18" />
<point frequencyHz="16000.00" levelDb="18.84" />
<point frequencyHz="17000.00" levelDb="25.44" />
<point frequencyHz="18000.00" levelDb="23.48" />
<point frequencyHz="19000.00" levelDb="23.22" />
<point frequencyHz="20000.00" levelDb="24.89" />
</frequencyResponse>
</microphone>
<microphone id="builtin_mic_2" location="MAINBODY" group="0" indexInTheGroup="1"
directionality="OMNI">
<device type="IN_MICROPHONE_BACK" address="back" />
<sensitivity levelDbfs="-37.0" maxSplDb="132.5" minSplDb="28.5" />
<position x="0.0546" y="0.1456" z="0.00415" />
<orientation x="0.0" y="1.0" z="0.0" />
<frequencyResponse>
<point frequencyHz="106.00" levelDb="-0.75" />
<point frequencyHz="112.00" levelDb="-0.74" />
<point frequencyHz="118.00" levelDb="-0.69" />
<point frequencyHz="125.00" levelDb="-0.65" />
<point frequencyHz="132.00" levelDb="-0.62" />
<point frequencyHz="140.00" levelDb="-0.61" />
<point frequencyHz="150.00" levelDb="-0.56" />
<point frequencyHz="160.00" levelDb="-0.53" />
<point frequencyHz="170.00" levelDb="-0.50" />
<point frequencyHz="180.00" levelDb="-0.47" />
<point frequencyHz="190.00" levelDb="-0.43" />
<point frequencyHz="200.00" levelDb="-0.40" />
<point frequencyHz="212.00" levelDb="-0.37" />
<point frequencyHz="224.00" levelDb="-0.36" />
<point frequencyHz="236.00" levelDb="-0.33" />
<point frequencyHz="250.00" levelDb="-0.30" />
<point frequencyHz="265.00" levelDb="-0.28" />
<point frequencyHz="280.00" levelDb="-0.25" />
<point frequencyHz="300.00" levelDb="-0.24" />
<point frequencyHz="315.00" levelDb="-0.24" />
<point frequencyHz="335.00" levelDb="-0.24" />
<point frequencyHz="355.00" levelDb="-0.25" />
<point frequencyHz="375.00" levelDb="-0.24" />
<point frequencyHz="400.00" levelDb="-0.12" />
<point frequencyHz="425.00" levelDb="-0.10" />
<point frequencyHz="450.00" levelDb="-0.08" />
<point frequencyHz="475.00" levelDb="-0.09" />
<point frequencyHz="500.00" levelDb="-0.07" />
<point frequencyHz="530.00" levelDb="-0.07" />
<point frequencyHz="560.00" levelDb="-0.06" />
<point frequencyHz="600.00" levelDb="-0.06" />
<point frequencyHz="630.00" levelDb="-0.06" />
<point frequencyHz="670.00" levelDb="-0.05" />
<point frequencyHz="710.00" levelDb="-0.04" />
<point frequencyHz="750.00" levelDb="-0.05" />
<point frequencyHz="800.00" levelDb="-0.04" />
<point frequencyHz="850.00" levelDb="-0.01" />
<point frequencyHz="900.00" levelDb="0.02" />
<point frequencyHz="950.00" levelDb="0.02" />
<point frequencyHz="1000.00" levelDb="0.00" />
<point frequencyHz="1060.00" levelDb="0.02" />
<point frequencyHz="1120.00" levelDb="0.03" />
<point frequencyHz="1180.00" levelDb="0.07" />
<point frequencyHz="1250.00" levelDb="0.10" />
<point frequencyHz="1320.00" levelDb="0.10" />
<point frequencyHz="1400.00" levelDb="0.13" />
<point frequencyHz="1500.00" levelDb="0.01" />
<point frequencyHz="1600.00" levelDb="0.01" />
<point frequencyHz="1700.00" levelDb="0.10" />
<point frequencyHz="1800.00" levelDb="0.11" />
<point frequencyHz="1900.00" levelDb="0.19" />
<point frequencyHz="2000.00" levelDb="0.24" />
<point frequencyHz="2120.00" levelDb="0.38" />
<point frequencyHz="2240.00" levelDb="0.46" />
<point frequencyHz="2360.00" levelDb="0.26" />
<point frequencyHz="2500.00" levelDb="0.27" />
<point frequencyHz="2650.00" levelDb="0.43" />
<point frequencyHz="2800.00" levelDb="0.76" />
<point frequencyHz="3000.00" levelDb="0.75" />
<point frequencyHz="3150.00" levelDb="1.09" />
<point frequencyHz="3350.00" levelDb="1.09" />
<point frequencyHz="3550.00" levelDb="0.94" />
<point frequencyHz="3750.00" levelDb="1.06" />
<point frequencyHz="4000.00" levelDb="1.21" />
<point frequencyHz="4250.00" levelDb="1.47" />
<point frequencyHz="4500.00" levelDb="1.45" />
<point frequencyHz="4750.00" levelDb="1.36" />
<point frequencyHz="5000.00" levelDb="2.07" />
<point frequencyHz="5300.00" levelDb="2.85" />
<point frequencyHz="5600.00" levelDb="2.90" />
<point frequencyHz="6000.00" levelDb="3.85" />
<point frequencyHz="6300.00" levelDb="4.65" />
<point frequencyHz="6700.00" levelDb="5.84" />
<point frequencyHz="7100.00" levelDb="5.46" />
<point frequencyHz="7500.00" levelDb="6.15" />
<point frequencyHz="8000.00" levelDb="7.50" />
<point frequencyHz="8500.00" levelDb="8.30" />
<point frequencyHz="9000.00" levelDb="10.62" />
<point frequencyHz="9500.00" levelDb="12.70" />
<point frequencyHz="10000.00" levelDb="16.65" />
<point frequencyHz="10600.00" levelDb="20.95" />
<point frequencyHz="11200.00" levelDb="25.41" />
<point frequencyHz="11800.00" levelDb="26.32" />
<point frequencyHz="12500.00" levelDb="20.20" />
<point frequencyHz="13200.00" levelDb="16.60" />
<point frequencyHz="14000.00" levelDb="11.24" />
<point frequencyHz="15000.00" levelDb="7.85" />
<point frequencyHz="16000.00" levelDb="7.62" />
<point frequencyHz="17000.00" levelDb="20.19" />
<point frequencyHz="18000.00" levelDb="7.32" />
<point frequencyHz="19000.00" levelDb="2.87" />
<point frequencyHz="20000.00" levelDb="5.18" />
</frequencyResponse>
</microphone>
</microphones>
<xi:include href="audio_policy_volumes.xml" /> <xi:include href="audio_policy_volumes.xml" />
<xi:include href="default_volume_tables.xml" /> <xi:include href="default_volume_tables.xml" />
</audioPlatformConfiguration> </audioPlatformConfiguration>

6
audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
View file

@ -11,6 +11,7 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<!-- Le Audio Audio Ports --> <!-- Le Audio Audio Ports -->
<mixPort name="le audio broadcast output" role="source" />
<mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000" samplingRates="44100 48000"
@ -51,6 +52,7 @@
<devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/> <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
<devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/> <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
<devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/> <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
<devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
</devicePorts> </devicePorts>
<routes> <routes>
<route type="mix" sink="BT A2DP Out" <route type="mix" sink="BT A2DP Out"
@ -66,6 +68,8 @@
<route type="mix" sink="le audio input" <route type="mix" sink="le audio input"
sources="BLE Headset In"/> sources="BLE Headset In"/>
<route type="mix" sink="BLE Speaker Out" <route type="mix" sink="BLE Speaker Out"
sources="le audio output"/> sources="le audio output"/>
<route type="mix" sink="BLE Broadcast Out"
sources="le audio broadcast output"/>
</routes> </routes>
</module> </module>

6
audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
View file

@ -11,6 +11,7 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<!-- Le Audio Audio Ports --> <!-- Le Audio Audio Ports -->
<mixPort name="le audio broadcast output" role="source" />
<mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000" samplingRates="44100 48000"
@ -51,6 +52,7 @@
<devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/> <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
<devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/> <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
<devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/> <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
<devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
</devicePorts> </devicePorts>
<routes> <routes>
<route type="mix" sink="BT A2DP Out" <route type="mix" sink="BT A2DP Out"
@ -66,6 +68,8 @@
<route type="mix" sink="le audio input" <route type="mix" sink="le audio input"
sources="BLE Headset In"/> sources="BLE Headset In"/>
<route type="mix" sink="BLE Speaker Out" <route type="mix" sink="BLE Speaker Out"
sources="le audio output"/> sources="le audio output"/>
<route type="mix" sink="BLE Broadcast Out"
sources="le audio broadcast output"/>
</routes> </routes>
</module> </module>

206
audio/shiba/aidl_config/audio_platform_configuration.xml
View file

@ -107,6 +107,212 @@
</enablement> </enablement>
</spatialCapture> </spatialCapture>
<microphones>
<microphone id="builtin_mic_1" location="MAINBODY" group="0" indexInTheGroup="0"
directionality="OMNI">
<device type="IN_MICROPHONE" address="bottom" />
<sensitivity levelDbfs="37.0" maxSplDb="132.5" minSplDb="28.5" />
<position x="0.0269" y="0.0058" z="0.0079" />
<orientation x="0.0" y="0.0" z="1.0" />
<frequencyResponse>
<point frequencyHz="100.00" levelDb="-0.78" />
<point frequencyHz="106.00" levelDb="-0.71" />
<point frequencyHz="112.00" levelDb="-0.64" />
<point frequencyHz="118.00" levelDb="-0.60" />
<point frequencyHz="125.00" levelDb="-0.55" />
<point frequencyHz="132.00" levelDb="-0.50" />
<point frequencyHz="140.00" levelDb="-0.47" />
<point frequencyHz="150.00" levelDb="-0.42" />
<point frequencyHz="160.00" levelDb="-0.39" />
<point frequencyHz="170.00" levelDb="-0.36" />
<point frequencyHz="180.00" levelDb="-0.34" />
<point frequencyHz="190.00" levelDb="-0.33" />
<point frequencyHz="200.00" levelDb="-0.32" />
<point frequencyHz="212.00" levelDb="-0.29" />
<point frequencyHz="224.00" levelDb="-0.28" />
<point frequencyHz="236.00" levelDb="-0.28" />
<point frequencyHz="250.00" levelDb="-0.27" />
<point frequencyHz="265.00" levelDb="-0.25" />
<point frequencyHz="280.00" levelDb="-0.25" />
<point frequencyHz="300.00" levelDb="-0.24" />
<point frequencyHz="315.00" levelDb="-0.23" />
<point frequencyHz="335.00" levelDb="-0.23" />
<point frequencyHz="355.00" levelDb="-0.22" />
<point frequencyHz="375.00" levelDb="-0.22" />
<point frequencyHz="400.00" levelDb="-0.19" />
<point frequencyHz="425.00" levelDb="-0.17" />
<point frequencyHz="450.00" levelDb="-0.15" />
<point frequencyHz="475.00" levelDb="-0.15" />
<point frequencyHz="500.00" levelDb="-0.14" />
<point frequencyHz="530.00" levelDb="-0.14" />
<point frequencyHz="560.00" levelDb="-0.12" />
<point frequencyHz="600.00" levelDb="-0.11" />
<point frequencyHz="630.00" levelDb="-0.10" />
<point frequencyHz="670.00" levelDb="-0.10" />
<point frequencyHz="710.00" levelDb="-0.08" />
<point frequencyHz="750.00" levelDb="-0.07" />
<point frequencyHz="800.00" levelDb="-0.07" />
<point frequencyHz="850.00" levelDb="-0.04" />
<point frequencyHz="900.00" levelDb="-0.03" />
<point frequencyHz="950.00" levelDb="-0.01" />
<point frequencyHz="1000.00" levelDb="0.00" />
<point frequencyHz="1060.00" levelDb="0.04" />
<point frequencyHz="1120.00" levelDb="0.06" />
<point frequencyHz="1180.00" levelDb="0.07" />
<point frequencyHz="1250.00" levelDb="0.08" />
<point frequencyHz="1320.00" levelDb="0.13" />
<point frequencyHz="1400.00" levelDb="0.09" />
<point frequencyHz="1500.00" levelDb="0.14" />
<point frequencyHz="1600.00" levelDb="0.19" />
<point frequencyHz="1700.00" levelDb="0.23" />
<point frequencyHz="1800.00" levelDb="0.28" />
<point frequencyHz="1900.00" levelDb="0.29" />
<point frequencyHz="2000.00" levelDb="0.31" />
<point frequencyHz="2120.00" levelDb="0.37" />
<point frequencyHz="2240.00" levelDb="0.88" />
<point frequencyHz="2360.00" levelDb="0.86" />
<point frequencyHz="2500.00" levelDb="0.77" />
<point frequencyHz="2650.00" levelDb="0.78" />
<point frequencyHz="2800.00" levelDb="0.84" />
<point frequencyHz="3000.00" levelDb="0.86" />
<point frequencyHz="3150.00" levelDb="1.05" />
<point frequencyHz="3350.00" levelDb="1.12" />
<point frequencyHz="3550.00" levelDb="1.18" />
<point frequencyHz="3750.00" levelDb="1.25" />
<point frequencyHz="4000.00" levelDb="1.43" />
<point frequencyHz="4250.00" levelDb="1.66" />
<point frequencyHz="4500.00" levelDb="1.83" />
<point frequencyHz="4750.00" levelDb="2.02" />
<point frequencyHz="5000.00" levelDb="2.23" />
<point frequencyHz="5300.00" levelDb="2.59" />
<point frequencyHz="5600.00" levelDb="2.84" />
<point frequencyHz="6000.00" levelDb="3.35" />
<point frequencyHz="6300.00" levelDb="4.01" />
<point frequencyHz="6700.00" levelDb="6.82" />
<point frequencyHz="7100.00" levelDb="6.62" />
<point frequencyHz="7500.00" levelDb="6.42" />
<point frequencyHz="8000.00" levelDb="7.30" />
<point frequencyHz="8500.00" levelDb="8.23" />
<point frequencyHz="9000.00" levelDb="7.54" />
<point frequencyHz="9500.00" levelDb="12.68" />
<point frequencyHz="10000.00" levelDb="13.76" />
<point frequencyHz="10600.00" levelDb="18.69" />
<point frequencyHz="11200.00" levelDb="19.68" />
<point frequencyHz="11800.00" levelDb="20.90" />
<point frequencyHz="12500.00" levelDb="23.70" />
<point frequencyHz="13200.00" levelDb="25.10" />
<point frequencyHz="14000.00" levelDb="21.65" />
<point frequencyHz="15000.00" levelDb="16.18" />
<point frequencyHz="16000.00" levelDb="18.84" />
<point frequencyHz="17000.00" levelDb="25.44" />
<point frequencyHz="18000.00" levelDb="23.48" />
<point frequencyHz="19000.00" levelDb="23.22" />
<point frequencyHz="20000.00" levelDb="24.89" />
</frequencyResponse>
</microphone>
<microphone id="builtin_mic_2" location="MAINBODY" group="0" indexInTheGroup="1"
directionality="OMNI">
<device type="IN_MICROPHONE_BACK" address="back" />
<sensitivity levelDbfs="-37.0" maxSplDb="132.5" minSplDb="28.5" />
<position x="0.0546" y="0.1456" z="0.00415" />
<orientation x="0.0" y="1.0" z="0.0" />
<frequencyResponse>
<point frequencyHz="106.00" levelDb="-0.75" />
<point frequencyHz="112.00" levelDb="-0.74" />
<point frequencyHz="118.00" levelDb="-0.69" />
<point frequencyHz="125.00" levelDb="-0.65" />
<point frequencyHz="132.00" levelDb="-0.62" />
<point frequencyHz="140.00" levelDb="-0.61" />
<point frequencyHz="150.00" levelDb="-0.56" />
<point frequencyHz="160.00" levelDb="-0.53" />
<point frequencyHz="170.00" levelDb="-0.50" />
<point frequencyHz="180.00" levelDb="-0.47" />
<point frequencyHz="190.00" levelDb="-0.43" />
<point frequencyHz="200.00" levelDb="-0.40" />
<point frequencyHz="212.00" levelDb="-0.37" />
<point frequencyHz="224.00" levelDb="-0.36" />
<point frequencyHz="236.00" levelDb="-0.33" />
<point frequencyHz="250.00" levelDb="-0.30" />
<point frequencyHz="265.00" levelDb="-0.28" />
<point frequencyHz="280.00" levelDb="-0.25" />
<point frequencyHz="300.00" levelDb="-0.24" />
<point frequencyHz="315.00" levelDb="-0.24" />
<point frequencyHz="335.00" levelDb="-0.24" />
<point frequencyHz="355.00" levelDb="-0.25" />
<point frequencyHz="375.00" levelDb="-0.24" />
<point frequencyHz="400.00" levelDb="-0.12" />
<point frequencyHz="425.00" levelDb="-0.10" />
<point frequencyHz="450.00" levelDb="-0.08" />
<point frequencyHz="475.00" levelDb="-0.09" />
<point frequencyHz="500.00" levelDb="-0.07" />
<point frequencyHz="530.00" levelDb="-0.07" />
<point frequencyHz="560.00" levelDb="-0.06" />
<point frequencyHz="600.00" levelDb="-0.06" />
<point frequencyHz="630.00" levelDb="-0.06" />
<point frequencyHz="670.00" levelDb="-0.05" />
<point frequencyHz="710.00" levelDb="-0.04" />
<point frequencyHz="750.00" levelDb="-0.05" />
<point frequencyHz="800.00" levelDb="-0.04" />
<point frequencyHz="850.00" levelDb="-0.01" />
<point frequencyHz="900.00" levelDb="0.02" />
<point frequencyHz="950.00" levelDb="0.02" />
<point frequencyHz="1000.00" levelDb="0.00" />
<point frequencyHz="1060.00" levelDb="0.02" />
<point frequencyHz="1120.00" levelDb="0.03" />
<point frequencyHz="1180.00" levelDb="0.07" />
<point frequencyHz="1250.00" levelDb="0.10" />
<point frequencyHz="1320.00" levelDb="0.10" />
<point frequencyHz="1400.00" levelDb="0.13" />
<point frequencyHz="1500.00" levelDb="0.01" />
<point frequencyHz="1600.00" levelDb="0.01" />
<point frequencyHz="1700.00" levelDb="0.10" />
<point frequencyHz="1800.00" levelDb="0.11" />
<point frequencyHz="1900.00" levelDb="0.19" />
<point frequencyHz="2000.00" levelDb="0.24" />
<point frequencyHz="2120.00" levelDb="0.38" />
<point frequencyHz="2240.00" levelDb="0.46" />
<point frequencyHz="2360.00" levelDb="0.26" />
<point frequencyHz="2500.00" levelDb="0.27" />
<point frequencyHz="2650.00" levelDb="0.43" />
<point frequencyHz="2800.00" levelDb="0.76" />
<point frequencyHz="3000.00" levelDb="0.75" />
<point frequencyHz="3150.00" levelDb="1.09" />
<point frequencyHz="3350.00" levelDb="1.09" />
<point frequencyHz="3550.00" levelDb="0.94" />
<point frequencyHz="3750.00" levelDb="1.06" />
<point frequencyHz="4000.00" levelDb="1.21" />
<point frequencyHz="4250.00" levelDb="1.47" />
<point frequencyHz="4500.00" levelDb="1.45" />
<point frequencyHz="4750.00" levelDb="1.36" />
<point frequencyHz="5000.00" levelDb="2.07" />
<point frequencyHz="5300.00" levelDb="2.85" />
<point frequencyHz="5600.00" levelDb="2.90" />
<point frequencyHz="6000.00" levelDb="3.85" />
<point frequencyHz="6300.00" levelDb="4.65" />
<point frequencyHz="6700.00" levelDb="5.84" />
<point frequencyHz="7100.00" levelDb="5.46" />
<point frequencyHz="7500.00" levelDb="6.15" />
<point frequencyHz="8000.00" levelDb="7.50" />
<point frequencyHz="8500.00" levelDb="8.30" />
<point frequencyHz="9000.00" levelDb="10.62" />
<point frequencyHz="9500.00" levelDb="12.70" />
<point frequencyHz="10000.00" levelDb="16.65" />
<point frequencyHz="10600.00" levelDb="20.95" />
<point frequencyHz="11200.00" levelDb="25.41" />
<point frequencyHz="11800.00" levelDb="26.32" />
<point frequencyHz="12500.00" levelDb="20.20" />
<point frequencyHz="13200.00" levelDb="16.60" />
<point frequencyHz="14000.00" levelDb="11.24" />
<point frequencyHz="15000.00" levelDb="7.85" />
<point frequencyHz="16000.00" levelDb="7.62" />
<point frequencyHz="17000.00" levelDb="20.19" />
<point frequencyHz="18000.00" levelDb="7.32" />
<point frequencyHz="19000.00" levelDb="2.87" />
<point frequencyHz="20000.00" levelDb="5.18" />
</frequencyResponse>
</microphone>
</microphones>
<xi:include href="audio_policy_volumes.xml" /> <xi:include href="audio_policy_volumes.xml" />
<xi:include href="default_volume_tables.xml" /> <xi:include href="default_volume_tables.xml" />
</audioPlatformConfiguration> </audioPlatformConfiguration>

106
audio/shiba/aidl_config/audio_policy_volumes.xml
View file

@ -51,8 +51,14 @@ volume index from 0 to 100.
<point>66,-2200</point> <point>66,-2200</point>
<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">
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> <point>1,-4500</point>
<point>29,-3400</point>
<point>57,-2250</point>
<point>71,-1900</point>
<point>86,-1530</point>
<point>100,-1100</point>
</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"/>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@ -62,9 +68,12 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
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,-2970</point> <point>1,-4000</point>
<point>33,-2010</point> <point>29,-2950</point>
<point>66,-1020</point> <point>43,-2350</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"
@ -76,31 +85,31 @@ volume index from 0 to 100.
<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,-6438</point> <point>1,-5927</point>
<point>4,-6438</point> <point>4,-5927</point>
<point>8,-5961</point> <point>8,-5574</point>
<point>12,-5543</point> <point>12,-5281</point>
<point>16,-5167</point> <point>16,-4952</point>
<point>20,-4743</point> <point>20,-4562</point>
<point>24,-4391</point> <point>24,-4213</point>
<point>28,-4061</point> <point>28,-3838</point>
<point>32,-3871</point> <point>32,-3600</point>
<point>36,-3673</point> <point>36,-3385</point>
<point>40,-3471</point> <point>40,-3116</point>
<point>44,-3273</point> <point>44,-2927</point>
<point>48,-3065</point> <point>48,-2665</point>
<point>52,-2850</point> <point>52,-2436</point>
<point>56,-2618</point> <point>56,-2181</point>
<point>60,-2355</point> <point>60,-1985</point>
<point>64,-2060</point> <point>64,-1743</point>
<point>68,-1773</point> <point>68,-1553</point>
<point>72,-1482</point> <point>72,-1427</point>
<point>76,-1205</point> <point>76,-1166</point>
<point>80,-989</point> <point>80,-1045</point>
<point>84,-791</point> <point>84,-895</point>
<point>88,-578</point> <point>88,-644</point>
<point>92,-374</point> <point>92,-486</point>
<point>96,-137</point> <point>96,-209</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"
@ -112,9 +121,11 @@ volume index from 0 to 100.
<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,-2970</point> <point>0,-5600</point>
<point>33,-2010</point> <point>29,-3520</point>
<point>66,-1020</point> <point>57,-1500</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"
@ -126,10 +137,11 @@ volume index from 0 to 100.
<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,-2970</point> <point>1,-4500</point>
<point>33,-2010</point> <point>29,-3800</point>
<point>66,-1020</point> <point>71,-1850</point>
<point>100,0</point> <point>86,-1000</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"/>
@ -165,8 +177,14 @@ volume index from 0 to 100.
<point>66,-2200</point> <point>66,-2200</point>
<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">
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> <point>1,-4500</point>
<point>29,-3400</point>
<point>57,-2250</point>
<point>71,-1900</point>
<point>86,-1530</point>
<point>100,-1100</point>
</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"/>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@ -179,8 +197,14 @@ volume index from 0 to 100.
<point>66,-2200</point> <point>66,-2200</point>
<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">
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> <point>1,-5700</point>
<point>29,-4230</point>
<point>43,-3300</point>
<point>57,-3100</point>
<point>71,-2500</point>
<point>100,-1400</point>
</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"/>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"

2
audio/shiba/aidl_config/mixer_paths_aidl.xml
View file

@ -1480,7 +1480,7 @@
<path name="adapted-voice-speaker"> <path name="adapted-voice-speaker">
<ctl name="R Boost Peak Current Limit" value="3.50A" /> <ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="Boost Peak Current Limit" value="3.50A" /> <ctl name="Boost Peak Current Limit" value="3.50A" />
<ctl name="Digital PCM Volume" value="800" /> <ctl name="Digital PCM Volume" value="817" />
<ctl name="R Digital PCM Volume" value="817" /> <ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<path name="adapted-voice-speaker-battery-throttled"> <path name="adapted-voice-speaker-battery-throttled">

6
audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
View file

@ -11,6 +11,7 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<!-- Le Audio Audio Ports --> <!-- Le Audio Audio Ports -->
<mixPort name="le audio broadcast output" role="source" />
<mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000" samplingRates="44100 48000"
@ -51,6 +52,7 @@
<devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/> <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
<devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/> <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
<devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/> <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
<devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
</devicePorts> </devicePorts>
<routes> <routes>
<route type="mix" sink="BT A2DP Out" <route type="mix" sink="BT A2DP Out"
@ -66,6 +68,8 @@
<route type="mix" sink="le audio input" <route type="mix" sink="le audio input"
sources="BLE Headset In"/> sources="BLE Headset In"/>
<route type="mix" sink="BLE Speaker Out" <route type="mix" sink="BLE Speaker Out"
sources="le audio output"/> sources="le audio output"/>
<route type="mix" sink="BLE Broadcast Out"
sources="le audio broadcast output"/>
</routes> </routes>
</module> </module>

2
bluetooth/bt_vendor_overlay.conf
View file

@ -40,3 +40,5 @@ BqrEventMaskValueUpdate = 295006
BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
BtOpusEnabled = true BtOpusEnabled = true
BtHalRecoveryByRestart = true

1
conf/init.husky.rc
View file

@ -41,6 +41,7 @@ on post-fs-data
# Bluetooth # Bluetooth
on post-fs-data on post-fs-data
chown bluetooth system /proc/bluetooth/timesync chown bluetooth system /proc/bluetooth/timesync
chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl
# Start the twoshay touch service # Start the twoshay touch service
on property:vendor.device.modules.ready=1 on property:vendor.device.modules.ready=1

1
conf/init.shiba.rc
View file

@ -37,6 +37,7 @@ on post-fs-data
# Bluetooth # Bluetooth
on post-fs-data on post-fs-data
chown bluetooth system /proc/bluetooth/timesync chown bluetooth system /proc/bluetooth/timesync
chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl
# Start the twoshay touch service # Start the twoshay touch service
on property:vendor.device.modules.ready=1 on property:vendor.device.modules.ready=1

28
device-husky.mk
View file

@ -72,10 +72,9 @@ endif
include device/google/shusky/camera/camera.mk include device/google/shusky/camera/camera.mk
include device/google/shusky/audio/husky/audio-tables.mk include device/google/shusky/audio/husky/audio-tables.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/stm/stm20.mk include device/google/gs-common/touch/stm/predump_stm20.mk
include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/gti/predump_gti.mk
include device/google/gs-common/touch/touchinspector/touchinspector.mk include device/google/gs-common/touch/touchinspector/touchinspector.mk
# Init files # Init files
@ -145,10 +144,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
ifeq ($(USE_AUDIO_HAL_AIDL),true) ifeq ($(USE_AUDIO_HAL_AIDL),true)
# AIDL # AIDL
# declare use of stereo spatialization
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.stereo_spatialization_enabled=true
else else
# HIDL # HIDL
@ -230,11 +225,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.ccp.server.enabled?=true \ bluetooth.profile.ccp.server.enabled?=true \
bluetooth.profile.vcp.controller.enabled?=true bluetooth.profile.vcp.controller.enabled?=true
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) # Bluetooth LE Audio Broadcast
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.assist.enabled=true \
bluetooth.profile.bap.broadcast.source.enabled=true bluetooth.profile.bap.broadcast.source.enabled=true
endif
# Bluetooth LE Audio enable hardware offloading # Bluetooth LE Audio enable hardware offloading
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -247,7 +241,7 @@ PRODUCT_COPY_FILES += \
# LE Audio Unicast Allowlist # LE Audio Unicast Allowlist
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630
# Bluetooth LE Audio CIS handover to SCO # Bluetooth LE Audio CIS handover to SCO
# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
@ -415,14 +409,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.scale=60 \
persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.fade=true \
persist.vendor.vibrator.hal.context.cooldowntime=1600 \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \
persist.vendor.vibrator.hal.context.settlingtime=5000 \ persist.vendor.vibrator.hal.context.settlingtime=5000
ro.vendor.vibrator.hal.dbc.enable=true \
ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \
ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \
ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \
ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \
ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \
ro.vendor.vibrator.hal.pm.activetimeout=5
# Override Output Distortion Gain # Override Output Distortion Gain
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -548,3 +535,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
# Enable APF by default
PRODUCT_VENDOR_PROPERTIES += \
vendor.powerhal.apf_disabled=false \
vendor.powerhal.apf_enabled=true

6
device-ripcurrent.mk
View file

@ -45,7 +45,6 @@ CAMERA_PRODUCT ?= ripcurrent
include device/google/shusky/audio/ripcurrent/audio-tables.mk include device/google/shusky/audio/ripcurrent/audio-tables.mk
include device/google/shusky/camera/camera.mk include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/gps/brcm/cbd_gps.mk
include device/google/gs-common/touch/stm/stm20.mk include device/google/gs-common/touch/stm/stm20.mk
@ -280,3 +279,8 @@ PRODUCT_VENDOR_PROPERTIES += \
# PKVM Memory Reclaim # PKVM Memory Reclaim
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
hypervisor.memory_reclaim.supported=1 hypervisor.memory_reclaim.supported=1
# Enable APF by default
PRODUCT_VENDOR_PROPERTIES += \
vendor.powerhal.apf_disabled=false \
vendor.powerhal.apf_enabled=true

26
device-shiba.mk
View file

@ -56,9 +56,8 @@ endif
include device/google/shusky/camera/camera.mk include device/google/shusky/camera/camera.mk
include device/google/shusky/audio/shiba/audio-tables.mk include device/google/shusky/audio/shiba/audio-tables.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/gti/predump_gti.mk
# Init files # Init files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -133,10 +132,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
ifeq ($(USE_AUDIO_HAL_AIDL),true) ifeq ($(USE_AUDIO_HAL_AIDL),true)
# AIDL # AIDL
# declare use of stereo spatialization
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.stereo_spatialization_enabled=true
else else
# HIDL # HIDL
@ -218,11 +213,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.ccp.server.enabled?=true \ bluetooth.profile.ccp.server.enabled?=true \
bluetooth.profile.vcp.controller.enabled?=true bluetooth.profile.vcp.controller.enabled?=true
ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) # Bluetooth LE Audio Broadcast
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.assist.enabled=true \
bluetooth.profile.bap.broadcast.source.enabled=true bluetooth.profile.bap.broadcast.source.enabled=true
endif
# Bluetooth LE Audio enable hardware offloading # Bluetooth LE Audio enable hardware offloading
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -235,7 +229,7 @@ PRODUCT_COPY_FILES += \
# LE Audio Unicast Allowlist # LE Audio Unicast Allowlist
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630
# Bluetooth LE Audio CIS handover to SCO # Bluetooth LE Audio CIS handover to SCO
# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
@ -392,14 +386,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.scale=60 \
persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.fade=true \
persist.vendor.vibrator.hal.context.cooldowntime=1600 \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \
persist.vendor.vibrator.hal.context.settlingtime=5000 \ persist.vendor.vibrator.hal.context.settlingtime=5000
ro.vendor.vibrator.hal.dbc.enable=true \
ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \
ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \
ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \
ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \
ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \
ro.vendor.vibrator.hal.pm.activetimeout=5
# Override Output Distortion Gain # Override Output Distortion Gain
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -517,3 +504,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
# Enable APF by default
PRODUCT_VENDOR_PROPERTIES += \
vendor.powerhal.apf_disabled=false \
vendor.powerhal.apf_enabled=true

2
nfc/libnfc-hal-st.conf
View file

@ -156,7 +156,7 @@ STNFC_REMOTE_FIELD_TIMER=0x01
############################################################################### ###############################################################################
# Configure the ACTIVE_RW timer # Configure the ACTIVE_RW timer
# Default 0x00, set 0x01 to enable it # Default 0x00, set 0x01 to enable it
# STNFC_ACTIVERW_TIMER=0x01 STNFC_ACTIVERW_TIMER=0x01
############################################################################### ###############################################################################
# Core configuration settings # Core configuration settings

179
perf/powerhint-husky.json
View file

@ -97,6 +97,7 @@
"Values": [ "Values": [
"9999999", "9999999",
"1548000", "1548000",
"1425000",
"1197000", "1197000",
"0" "0"
], ],
@ -136,6 +137,7 @@
"9999999", "9999999",
"2245000", "2245000",
"2130000", "2130000",
"1572000",
"1836000", "1836000",
"0" "0"
], ],
@ -177,6 +179,7 @@
"2687000", "2687000",
"2363000", "2363000",
"2147000", "2147000",
"1745000",
"1885000", "1885000",
"0" "0"
], ],
@ -320,6 +323,51 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "TAUclampMinOnNiceEnable",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
"Values": [
"1",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceHighValue",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value",
"Values": [
"765",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceMidValue",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
"Values": [
"570",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceHighPrio",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
"Values": [
"110",
"120"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceMidPrio",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
"Values": [
"139",
"130"
],
"ResetOnInit": true
},
{ {
"Name": "FGUClampBoost", "Name": "FGUClampBoost",
"Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@ -428,6 +476,15 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "TAAutoPreferFit",
"Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit",
"Values": [
"1",
"0"
],
"ResetOnInit": true
},
{ {
"Name": "TAPreferredIdleMaskHigh", "Name": "TAPreferredIdleMaskHigh",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
@ -864,7 +921,8 @@
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskMid", "Node": "TAPreferredIdleMaskMid",
"Duration": 5000, "Duration": 5000,
"Value": "0x1ff" "Value": "0x1ff",
"EnableProperty": "vendor.powerhal.apf_disabled"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -929,7 +987,8 @@
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAUClampBoost", "Node": "TAUClampBoost",
"Duration": 5000, "Duration": 5000,
"Value": "765" "Value": "765",
"EnableProperty": "vendor.powerhal.apf_disabled"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -1001,6 +1060,48 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH",
"Node": "TAAutoPreferFit",
"Duration": 5000,
"Value": "1",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceEnable",
"Duration": 5000,
"Value": "1",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighValue",
"Duration": 5000,
"Value": "765",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighPrio",
"Duration": 5000,
"Value": "110",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidValue",
"Duration": 5000,
"Value": "570",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidPrio",
"Duration": 5000,
"Value": "139",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "FGPreferIdle", "Node": "FGPreferIdle",
@ -1526,6 +1627,24 @@
"Duration": 100, "Duration": 100,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "CDPreferIdle",
"Duration": 100,
"Value": "1"
},
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "AutoPreferIdle",
"Duration": 100,
"Value": "0"
},
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "PMU_POLL",
"Duration": 100,
"Value": "0"
},
{ {
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
"Node": "TAPreferHighCap", "Node": "TAPreferHighCap",
@ -1832,6 +1951,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -1974,7 +2099,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "1"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -2006,6 +2131,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2048,6 +2179,18 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "TAPreferIdle",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2204,6 +2347,18 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "TAPreferIdle",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2330,6 +2485,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2486,37 +2647,37 @@
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1745000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUBigClusterMinFreq", "Node": "CPUBigClusterMinFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1745000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUMidClusterMaxFreq", "Node": "CPUMidClusterMaxFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1572000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUMidClusterMinFreq", "Node": "CPUMidClusterMinFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1572000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPULittleClusterMaxFreq", "Node": "CPULittleClusterMaxFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1425000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPULittleClusterMinFreq", "Node": "CPULittleClusterMinFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1425000"
}, },
{ {
"PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",

164
perf/powerhint-ripcurrent.json
View file

@ -315,6 +315,51 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "TAUclampMinOnNiceEnable",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
"Values": [
"1",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceHighValue",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value",
"Values": [
"765",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceMidValue",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
"Values": [
"570",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceHighPrio",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
"Values": [
"110",
"120"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceMidPrio",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
"Values": [
"139",
"130"
],
"ResetOnInit": true
},
{ {
"Name": "FGUClampBoost", "Name": "FGUClampBoost",
"Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@ -423,6 +468,15 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "TAAutoPreferFit",
"Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit",
"Values": [
"1",
"0"
],
"ResetOnInit": true
},
{ {
"Name": "TAPreferredIdleMaskHigh", "Name": "TAPreferredIdleMaskHigh",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
@ -895,7 +949,8 @@
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskMid", "Node": "TAPreferredIdleMaskMid",
"Duration": 5000, "Duration": 5000,
"Value": "0x1ff" "Value": "0x1ff",
"EnableProperty": "vendor.powerhal.apf_disabled"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -960,7 +1015,8 @@
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAUClampBoost", "Node": "TAUClampBoost",
"Duration": 5000, "Duration": 5000,
"Value": "765" "Value": "765",
"EnableProperty": "vendor.powerhal.apf_disabled"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -1032,6 +1088,48 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH",
"Node": "TAAutoPreferFit",
"Duration": 5000,
"Value": "1",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceEnable",
"Duration": 5000,
"Value": "1",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighValue",
"Duration": 5000,
"Value": "765",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighPrio",
"Duration": 5000,
"Value": "110",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidValue",
"Duration": 5000,
"Value": "570",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidPrio",
"Duration": 5000,
"Value": "139",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "FGPreferIdle", "Node": "FGPreferIdle",
@ -1493,6 +1591,24 @@
"Duration": 100, "Duration": 100,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "CDPreferIdle",
"Duration": 100,
"Value": "1"
},
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "AutoPreferIdle",
"Duration": 100,
"Value": "0"
},
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "PMU_POLL",
"Duration": 100,
"Value": "0"
},
{ {
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
"Node": "TAPreferHighCap", "Node": "TAPreferHighCap",
@ -1697,6 +1813,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -1827,7 +1949,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "1"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -1859,6 +1981,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -1889,6 +2017,18 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "TAPreferIdle",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2027,6 +2167,18 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "TAPreferIdle",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2147,6 +2299,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",

181
perf/powerhint-shiba.json
View file

@ -97,6 +97,7 @@
"Values": [ "Values": [
"9999999", "9999999",
"1548000", "1548000",
"1425000",
"1197000", "1197000",
"0" "0"
], ],
@ -132,6 +133,7 @@
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
"Values": [ "Values": [
"9999999", "9999999",
"1572000",
"1836000", "1836000",
"0" "0"
], ],
@ -168,6 +170,7 @@
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
"Values": [ "Values": [
"9999999", "9999999",
"1745000",
"1885000", "1885000",
"0" "0"
], ],
@ -321,6 +324,51 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "TAUclampMinOnNiceEnable",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
"Values": [
"1",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceHighValue",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value",
"Values": [
"765",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceMidValue",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
"Values": [
"570",
"0"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceHighPrio",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
"Values": [
"110",
"120"
],
"ResetOnInit": true
},
{
"Name": "TAUclampMinOnNiceMidPrio",
"Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
"Values": [
"139",
"130"
],
"ResetOnInit": true
},
{ {
"Name": "FGUClampBoost", "Name": "FGUClampBoost",
"Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@ -429,6 +477,15 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "TAAutoPreferFit",
"Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit",
"Values": [
"1",
"0"
],
"ResetOnInit": true
},
{ {
"Name": "TAPreferredIdleMaskHigh", "Name": "TAPreferredIdleMaskHigh",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
@ -865,7 +922,8 @@
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskMid", "Node": "TAPreferredIdleMaskMid",
"Duration": 5000, "Duration": 5000,
"Value": "0x1ff" "Value": "0x1ff",
"EnableProperty": "vendor.powerhal.apf_disabled"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -930,7 +988,8 @@
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "TAUClampBoost", "Node": "TAUClampBoost",
"Duration": 5000, "Duration": 5000,
"Value": "765" "Value": "765",
"EnableProperty": "vendor.powerhal.apf_disabled"
}, },
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
@ -1002,6 +1061,48 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH",
"Node": "TAAutoPreferFit",
"Duration": 5000,
"Value": "1",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceEnable",
"Duration": 5000,
"Value": "1",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighValue",
"Duration": 5000,
"Value": "765",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighPrio",
"Duration": 5000,
"Value": "110",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidValue",
"Duration": 5000,
"Value": "570",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidPrio",
"Duration": 5000,
"Value": "139",
"EnableProperty": "vendor.powerhal.apf_enabled"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "FGPreferIdle", "Node": "FGPreferIdle",
@ -1533,6 +1634,24 @@
"Duration": 100, "Duration": 100,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "CDPreferIdle",
"Duration": 100,
"Value": "1"
},
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "AutoPreferIdle",
"Duration": 100,
"Value": "0"
},
{
"PowerHint": "CAMERA_MULTICAM_BOOST",
"Node": "PMU_POLL",
"Duration": 100,
"Value": "0"
},
{ {
"PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "PowerHint": "GCA_CAMERA_SHOT_BIGCPU",
"Node": "TAPreferHighCap", "Node": "TAPreferHighCap",
@ -1737,6 +1856,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_EXTREME", "PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -1879,7 +2004,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "1"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -1905,6 +2030,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -1953,6 +2084,18 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "TAPreferIdle",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2037,7 +2180,7 @@
"Duration": 0, "Duration": 0,
"Value": "cam1" "Value": "cam1"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold", "Node": "CPUUtilThreshold",
"Duration": 0, "Duration": 0,
@ -2109,6 +2252,18 @@
"Duration": 0, "Duration": 0,
"Value": "0x0" "Value": "0x0"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "TAPreferIdle",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2235,6 +2390,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "FGPreferIdle",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "AutoPreferIdle", "Node": "AutoPreferIdle",
@ -2391,37 +2552,37 @@
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1745000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUBigClusterMinFreq", "Node": "CPUBigClusterMinFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1745000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUMidClusterMaxFreq", "Node": "CPUMidClusterMaxFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1572000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPUMidClusterMinFreq", "Node": "CPUMidClusterMinFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1572000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPULittleClusterMaxFreq", "Node": "CPULittleClusterMaxFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1425000"
}, },
{ {
"PowerHint": "FIXED_PERFORMANCE", "PowerHint": "FIXED_PERFORMANCE",
"Node": "CPULittleClusterMinFreq", "Node": "CPULittleClusterMinFreq",
"Duration": 0, "Duration": 0,
"Value": "9999999" "Value": "1425000"
}, },
{ {
"PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",

2
rro_overlays/WifiOverlay/res/values/config.xml
View file

@ -182,4 +182,6 @@
false: firmware roaming will not be affected. --> false: firmware roaming will not be affected. -->
<bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool> <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
<!-- Boolean indicating whether to trigger bugreport for WiFi subsystem restart issue -->
<bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
</resources> </resources>

61
thermal/Android.bp
View file

@ -1,61 +0,0 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_library {
name: "thermal-config-cpp",
proto: {
type: "lite",
export_proto_headers: true,
include_dirs: [
"external/protobuf/src",
"device/google/gs-common/thermal/thermal_hal/thermal_config_schemas"
],
}
}
cc_test_host {
name: "shusky-thermal-config-test",
srcs: [
"thermal_config_test.cpp",
],
static_libs: [
"libbase",
"libgmock",
"liblog",
"libjsoncpp",
"libjsonpbverify",
"libjsonpbparse",
"thermal_HAL_info_config_proto",
],
shared_libs: [
"libprotobuf-cpp-full",
],
cflags: [
"-Wall",
"-Werror",
"-Wno-unused-parameter",
],
data: [
"*.json"
],
test_suites: [
"general-tests",
],
}

55
thermal/thermal_config_test.cpp
View file

@ -1,55 +0,0 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <android-base/file.h>
#include <gtest/gtest.h>
#include <jsonpb/json_schema_test.h>
#include "thermal_info_config_test.h"
using namespace ::android::jsonpb;
using ::android::base::GetExecutableDirectory;
namespace devices {
namespace shusky {
template <typename T>
JsonSchemaTestConfigFactory MakeTestParam(const std::string &path) {
return android::jsonpb::MakeTestParam<T>(GetExecutableDirectory() + path);
}
// Make test suite for thermal info config schema.
INSTANTIATE_TEST_SUITE_P(
ThermalSuite, ThermalInfoConfigTest,
::testing::Values(
MakeTestParam<ThermalConfig>("/thermal_info_config_husky.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_shiba.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_charge_husky.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_charge_shiba.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_ripcurrent.json"),
MakeTestParam<ThermalConfig>(
"/thermal_info_config_charge_ripcurrent.json")));
// Ignores a formatting check (b/c 0.0 != 0 textually)
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(JsonSchemaTest);
int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
} // namespace shusky
} // namespace devices

25
thermal/thermal_info_config_charge_husky.json
View file

@ -127,13 +127,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WLC", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -153,8 +163,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0, -1000000], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"],
"HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -329,8 +340,8 @@
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":5 "PowerSampleCount":5
} }

25
thermal/thermal_info_config_charge_shiba.json
View file

@ -160,13 +160,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WLC", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -186,8 +196,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0, -1000000], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"],
"HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -362,8 +373,8 @@
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":5 "PowerSampleCount":5
} }

25
thermal/thermal_info_config_husky.json
View file

@ -717,13 +717,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WLC", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -743,8 +753,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0, -1000000], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"],
"HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -1051,8 +1062,8 @@
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":5 "PowerSampleCount":5
} }

25
thermal/thermal_info_config_shiba.json
View file

@ -729,13 +729,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WLC", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -755,8 +765,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0, -1000000], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"],
"HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -1084,8 +1095,8 @@
"Name":"PARTIAL_SYSTEM_POWER", "Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true, "VirtualRails":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
"PowerSampleDelay":7000, "PowerSampleDelay":7000,
"PowerSampleCount":5 "PowerSampleCount":5
} }

58
thermal/thermal_info_config_test.h
View file

@ -1,58 +0,0 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <string>
#include <gmock/gmock.h>
#include <jsonpb/json_schema_test.h>
#include "thermal_info_config.pb.h"
namespace devices {
namespace shusky {
// JSON schema test wrapper.
class ThermalInfoConfigTest : public android::jsonpb::JsonSchemaTest {
public:
void SetUp() override {
JsonSchemaTest::SetUp();
thermalInfoConfig_ = static_cast<ThermalConfig *>(message());
}
ThermalConfig *thermalInfoConfig_ = nullptr;
};
// Individual test checking for sensor name and type as required fields.
TEST_P(ThermalInfoConfigTest, ThermalConfigRequiredFields) {
std::string error;
// Checks that no unknown fields are introduced.
EXPECT_TRUE(android::jsonpb::AllFieldsAreKnown(*object_, json_, &error))
<< "File: " << file_path_ << ": " << error;
// Check all Sensors have a Name and Type.
for (int i = 0; i < thermalInfoConfig_->sensors_size(); ++i) {
auto &&sensor = thermalInfoConfig_->sensors(i);
EXPECT_FALSE(sensor.name().empty())
<< "No name for sensor #" << i << " in " << file_path_;
EXPECT_FALSE(sensor.type().empty())
<< "No type for sensor " << sensor.name() << " in " << file_path_;
}
};
} // namespace shusky
} // namespace devices