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

Snap for 11571437 from c7039b4563 to 24Q3-release

Browse source 
Change-Id: I7ff99dc36112e6c5ffdfa462ff27bf09f131e4d3
This commit is contained in:
Android Build Coastguard Worker 2024-03-13 23:01:41 +00:00
commit fee2cede4c
12 changed files with 59 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

12
audio/caiman/aidl_config/audio_platform_configuration.xml
View file

@ -81,8 +81,8 @@
<latency source="primary-playback" sink="speaker" milliseconds="20" /> <latency source="primary-playback" sink="speaker" milliseconds="20" />
<latency source="primary-playback" sink="usb-device" milliseconds="10" /> <latency source="primary-playback" sink="usb-device" milliseconds="10" />
<latency source="primary-playback" sink="usb-headset" milliseconds="10" /> <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" /> <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" /> <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
<latency source="deep-buffer-playback" sink="speaker" milliseconds="70" /> <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
<latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" /> <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@ -96,9 +96,11 @@
<latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" /> <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="microphones" sink="primary-capture" milliseconds="160" /> <latency source="microphones" sink="primary-capture" milliseconds="300" />
<latency source="back-microphones" sink="primary-capture" milliseconds="160" /> <latency source="back-microphones" sink="primary-capture" milliseconds="300" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" /> <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
<latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
<latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
</latencies> </latencies>
<spatialCapture> <spatialCapture>

10
audio/caiman/aidl_config/mixer_paths_aidl.xml
View file

@ -1392,13 +1392,21 @@
<path name="bluetooth-sco-headset-microphones" /> <path name="bluetooth-sco-headset-microphones" />
</path> </path>
<path name="usb-headset-microphones"> <path name="usb-microphones">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" /> <ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" /> <ctl name="Voice Call Mic Source" value="USB_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c --> <!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start"> <path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware --> <!-- Enable it after get the protection firmware -->

12
audio/komodo/aidl_config/audio_platform_configuration.xml
View file

@ -81,8 +81,8 @@
<latency source="primary-playback" sink="speaker" milliseconds="20" /> <latency source="primary-playback" sink="speaker" milliseconds="20" />
<latency source="primary-playback" sink="usb-device" milliseconds="10" /> <latency source="primary-playback" sink="usb-device" milliseconds="10" />
<latency source="primary-playback" sink="usb-headset" milliseconds="10" /> <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" /> <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" /> <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
<latency source="deep-buffer-playback" sink="speaker" milliseconds="70" /> <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
<latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" /> <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@ -96,9 +96,11 @@
<latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" /> <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="microphones" sink="primary-capture" milliseconds="160" /> <latency source="microphones" sink="primary-capture" milliseconds="300" />
<latency source="back-microphones" sink="primary-capture" milliseconds="160" /> <latency source="back-microphones" sink="primary-capture" milliseconds="300" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" /> <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
<latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
<latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
</latencies> </latencies>
<spatialCapture> <spatialCapture>

10
audio/komodo/aidl_config/mixer_paths_aidl.xml
View file

@ -1392,13 +1392,21 @@
<path name="bluetooth-sco-headset-microphones" /> <path name="bluetooth-sco-headset-microphones" />
</path> </path>
<path name="usb-headset-microphones"> <path name="usb-microphones">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" /> <ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" /> <ctl name="Voice Call Mic Source" value="USB_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c --> <!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start"> <path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware --> <!-- Enable it after get the protection firmware -->

12
audio/tokay/aidl_config/audio_platform_configuration.xml
View file

@ -81,8 +81,8 @@
<latency source="primary-playback" sink="speaker" milliseconds="20" /> <latency source="primary-playback" sink="speaker" milliseconds="20" />
<latency source="primary-playback" sink="usb-device" milliseconds="10" /> <latency source="primary-playback" sink="usb-device" milliseconds="10" />
<latency source="primary-playback" sink="usb-headset" milliseconds="10" /> <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" /> <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" /> <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
<latency source="deep-buffer-playback" sink="speaker" milliseconds="70" /> <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
<latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" /> <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@ -96,9 +96,11 @@
<latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" /> <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="microphones" sink="primary-capture" milliseconds="160" /> <latency source="microphones" sink="primary-capture" milliseconds="300" />
<latency source="back-microphones" sink="primary-capture" milliseconds="160" /> <latency source="back-microphones" sink="primary-capture" milliseconds="300" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" /> <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
<latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
<latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
</latencies> </latencies>
<spatialCapture> <spatialCapture>

10
audio/tokay/aidl_config/mixer_paths_aidl.xml
View file

@ -1392,13 +1392,21 @@
<path name="bluetooth-sco-headset-microphones" /> <path name="bluetooth-sco-headset-microphones" />
</path> </path>
<path name="usb-headset-microphones"> <path name="usb-microphones">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" /> <ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" /> <ctl name="Voice Call Mic Source" value="USB_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c --> <!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start"> <path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware --> <!-- Enable it after get the protection firmware -->

7
conf/init.caiman.rc
View file

@ -71,10 +71,3 @@ on property:sys.boot_completed=1
chown system input /dev/touch_offload chown system input /dev/touch_offload
chmod 660 /dev/touch_offload chmod 660 /dev/touch_offload
start twoshay start twoshay
# ETM
on init && property:ro.build.flavor=caiman-userdebug
import /vendor/etc/init/hw/init.etm.rc
on init && property:ro.build.flavor=caiman-eng
import /vendor/etc/init/hw/init.etm.rc

3
device-caiman.mk
View file

@ -392,3 +392,6 @@ endif
# Enable Bluetooth AutoOn feature # Enable Bluetooth AutoOn feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true bluetooth.server.automatic_turn_on=true
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)

3
device-komodo.mk
View file

@ -388,3 +388,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Enable Bluetooth AutoOn feature # Enable Bluetooth AutoOn feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true bluetooth.server.automatic_turn_on=true
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)

3
device-tokay.mk
View file

@ -358,3 +358,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Enable Bluetooth AutoOn feature # Enable Bluetooth AutoOn feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true bluetooth.server.automatic_turn_on=true
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)

33
powerstats/caiman/service.cpp
View file

@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = {
"Off",
"LP: 960x2142@1",
"LP: 960x2142@30",
"On: 960x2142@1",
"On: 960x2142@30",
"On: 960x2142@60",
"On: 960x2142@120",
"HBM: 960x2142@60",
"HBM: 960x2142@120",
"LP: 1280x2856@1",
"LP: 1280x2856@30",
"On: 1280x2856@1",
"On: 1280x2856@30",
"On: 1280x2856@60",
"On: 1280x2856@120",
"HBM: 1280x2856@60",
"HBM: 1280x2856@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display",
"/sys/class/backlight/panel0-backlight/state",
states));
}
// Add display energy consumer // Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
p, p,
@ -81,6 +49,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addDisplayVrr(p, "Display");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addDisplay(p);

33
powerstats/komodo/service.cpp
View file

@ -33,38 +33,6 @@ using aidl::android::hardware::power::stats::EnergyConsumerType;
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = {
"Off",
"LP: 1008x2244@1",
"LP: 1008x2244@30",
"On: 1008x2244@1",
"On: 1008x2244@30",
"On: 1008x2244@60",
"On: 1008x2244@120",
"HBM: 1008x2244@60",
"HBM: 1008x2244@120",
"LP: 1344x2992@1",
"LP: 1344x2992@30",
"On: 1344x2992@1",
"On: 1344x2992@30",
"On: 1344x2992@60",
"On: 1344x2992@120",
"HBM: 1344x2992@60",
"HBM: 1344x2992@120"};
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
"Display",
"/sys/class/backlight/panel0-backlight/state",
states));
}
// Add display energy consumer // Add display energy consumer
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(
p, p,
@ -81,6 +49,7 @@ int main() {
std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>(); std::shared_ptr<PowerStats> p = ndk::SharedRefBase::make<PowerStats>();
addDisplayVrr(p, "Display");
addZumaProCommonDataProviders(p); addZumaProCommonDataProviders(p);
addDisplay(p); addDisplay(p);