Merge Android 13 QPR3
Bug: 275386652 Merged-In: I3b2c20a25ee0e8f261a77ba5a32b85b8bedfa6d9 Change-Id: I1e4d06f43e84f3885385c9a8d75af987aade67bf
This commit is contained in:
commit
4abcb959ad
19 changed files with 5668 additions and 5590 deletions
|
@ -3,88 +3,88 @@ on property:vendor.thermal.link_ready=1
|
|||
chown system system /data/vendor/mitigation
|
||||
start vendor.battery_mitigation
|
||||
|
||||
on property:ro.boot.bootreason=reboot,uvlo,pmic,if
|
||||
on property:ro.boot.bootreason=reboot,uvlo,pmic,if && property:sys.boot.reason=reboot,uvlo,pmic,if
|
||||
setprop vendor.brownout_reason "uvlo,pmic,if"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,pmic,if
|
||||
on property:ro.boot.bootreason=reboot,ocp,pmic,if && property:sys.boot.reason=reboot,ocp,pmic,if
|
||||
setprop vendor.brownout_reason "ocp,pmic,if"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,uvlo,pmic,main
|
||||
on property:ro.boot.bootreason=reboot,uvlo,pmic,main && property:sys.boot.reason=reboot,uvlo,pmic,main
|
||||
setprop vendor.brownout_reason "uvlo,pmic,main"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,uvlo,pmic,sub
|
||||
on property:ro.boot.bootreason=reboot,uvlo,pmic,sub && property:sys.boot.reason=reboot,uvlo,pmic,sub
|
||||
setprop vendor.brownout_reason "uvlo,pmic,sub"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck1m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck1m && property:sys.boot.reason=reboot,ocp,buck1m
|
||||
setprop vendor.brownout_reason "ocp,buck1m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck2m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck2m && property:sys.boot.reason=reboot,ocp,buck2m
|
||||
setprop vendor.brownout_reason "ocp,buck2m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck3m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck3m && property:sys.boot.reason=reboot,ocp,buck3m
|
||||
setprop vendor.brownout_reason "ocp,buck3m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck4m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck4m && property:sys.boot.reason=reboot,ocp,buck4m
|
||||
setprop vendor.brownout_reason "ocp,buck4m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck5m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck5m && property:sys.boot.reason=reboot,ocp,buck5m
|
||||
setprop vendor.brownout_reason "ocp,buck5m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck6m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck6m && property:sys.boot.reason=reboot,ocp,buck6m
|
||||
setprop vendor.brownout_reason "ocp,buck6m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck7m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck7m && property:sys.boot.reason=reboot,ocp,buck7m
|
||||
setprop vendor.brownout_reason "ocp,buck7m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck8m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck8m && property:sys.boot.reason=reboot,ocp,buck8m
|
||||
setprop vendor.brownout_reason "ocp,buck8m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck9m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck9m && property:sys.boot.reason=reboot,ocp,buck9m
|
||||
setprop vendor.brownout_reason "ocp,buck9m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck10m
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck10m && property:sys.boot.reason=reboot,ocp,buck10m
|
||||
setprop vendor.brownout_reason "ocp,buck10m"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck1s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck1s && property:sys.boot.reason=reboot,ocp,buck1s
|
||||
setprop vendor.brownout_reason "ocp,buck1s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck2s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck2s && property:sys.boot.reason=reboot,ocp,buck2s
|
||||
setprop vendor.brownout_reason "ocp,buck2s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck3s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck3s && property:sys.boot.reason=reboot,ocp,buck3s
|
||||
setprop vendor.brownout_reason "ocp,buck3s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck4s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck4s && property:sys.boot.reason=reboot,ocp,buck4s
|
||||
setprop vendor.brownout_reason "ocp,buck4s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck5s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck5s && property:sys.boot.reason=reboot,ocp,buck5s
|
||||
setprop vendor.brownout_reason "ocp,buck5s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck6s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck6s && property:sys.boot.reason=reboot,ocp,buck6s
|
||||
setprop vendor.brownout_reason "ocp,buck6s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck7s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck7s && property:sys.boot.reason=reboot,ocp,buck7s
|
||||
setprop vendor.brownout_reason "ocp,buck7s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck8s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck8s && property:sys.boot.reason=reboot,ocp,buck8s
|
||||
setprop vendor.brownout_reason "ocp,buck8s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck9s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck9s && property:sys.boot.reason=reboot,ocp,buck9s
|
||||
setprop vendor.brownout_reason "ocp,buck9s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck10s
|
||||
on property:ro.boot.bootreason=reboot,ocp,buck10s && property:sys.boot.reason=reboot,ocp,buck10s
|
||||
setprop vendor.brownout_reason "ocp,buck10s"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckds
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckds && property:sys.boot.reason=reboot,ocp,buckds
|
||||
setprop vendor.brownout_reason "ocp,buckds"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckas
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckas && property:sys.boot.reason=reboot,ocp,buckas
|
||||
setprop vendor.brownout_reason "ocp,buckas"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckcs
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckcs && property:sys.boot.reason=reboot,ocp,buckcs
|
||||
setprop vendor.brownout_reason "ocp,buckcs"
|
||||
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckbs
|
||||
on property:ro.boot.bootreason=reboot,ocp,buckbs && property:sys.boot.reason=reboot,ocp,buckbs
|
||||
setprop vendor.brownout_reason "ocp,buckbs"
|
||||
|
||||
service vendor.battery_mitigation /vendor/bin/hw/battery_mitigation
|
||||
|
|
|
@ -38,3 +38,8 @@ on post-fs-data
|
|||
chown bluetooth system /dev/logbuffer_btlpm
|
||||
chown bluetooth system /dev/logbuffer_btpower
|
||||
chown bluetooth system /dev/logbuffer_tty18
|
||||
|
||||
# Enable etm/etm2dram when ramdump is enabled.
|
||||
on property:ro.boot.ramdump=enabled
|
||||
write /sys/devices/platform/exynos-etm/etm_on 1
|
||||
write /sys/devices/platform/etm2dram/arm 1
|
||||
|
|
|
@ -220,6 +220,7 @@ on init
|
|||
# Dump eeprom
|
||||
chown system system /sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom
|
||||
chown system system /sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom
|
||||
chown system system /sys/devices/platform/10da0000.hsi2c/i2c-5/5-0050/eeprom
|
||||
chown system system /sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom
|
||||
chown system system /sys/devices/platform/10da0000.hsi2c/i2c-7/7-0050/eeprom
|
||||
|
||||
|
@ -295,6 +296,9 @@ on init
|
|||
chown system system /sys/devices/platform/google,charger/dd_state
|
||||
chown system system /sys/devices/platform/google,charger/dd_settings
|
||||
|
||||
# Battery temperature filter
|
||||
chown system system /sys/class/power_supply/battery/temp_filter_enable
|
||||
|
||||
# Power Stats HAL
|
||||
chown system system /dev/bbd_pwrstat
|
||||
|
||||
|
@ -447,6 +451,20 @@ on early-boot
|
|||
chown system system /dev/sys/block/bootdevice/slowio_unmap_cnt
|
||||
chown system system /dev/sys/block/bootdevice/slowio_sync_cnt
|
||||
|
||||
# PCIe link stats for pixelstats
|
||||
chown system system /sys/devices/platform/11920000.pcie/link_stats/complete_timeout_irqs
|
||||
chown system system /sys/devices/platform/11920000.pcie/link_stats/link_down_irqs
|
||||
chown system system /sys/devices/platform/11920000.pcie/link_stats/link_recovery_failures
|
||||
chown system system /sys/devices/platform/11920000.pcie/link_stats/link_up_average
|
||||
chown system system /sys/devices/platform/11920000.pcie/link_stats/link_up_failures
|
||||
chown system system /sys/devices/platform/11920000.pcie/link_stats/pll_lock_average
|
||||
chown system system /sys/devices/platform/14520000.pcie/link_stats/complete_timeout_irqs
|
||||
chown system system /sys/devices/platform/14520000.pcie/link_stats/link_down_irqs
|
||||
chown system system /sys/devices/platform/14520000.pcie/link_stats/link_recovery_failures
|
||||
chown system system /sys/devices/platform/14520000.pcie/link_stats/link_up_average
|
||||
chown system system /sys/devices/platform/14520000.pcie/link_stats/link_up_failures
|
||||
chown system system /sys/devices/platform/14520000.pcie/link_stats/pll_lock_average
|
||||
|
||||
# Dump Battery EEPROM history for pixelstats
|
||||
chown system system /dev/battery_history
|
||||
chmod 0644 /dev/battery_history
|
||||
|
@ -454,10 +472,10 @@ on early-boot
|
|||
# Permission for logbuffer
|
||||
chown system system /dev/logbuffer_maxfg
|
||||
chown system system /dev/logbuffer_maxfg_base
|
||||
chown system system /dev/logbuffer_maxfg_flip
|
||||
chown system system /dev/logbuffer_maxfg_secondary
|
||||
chown system system /dev/logbuffer_maxfg_monitor
|
||||
chown system system /dev/logbuffer_maxfg_base_monitor
|
||||
chown system system /dev/logbuffer_maxfg_flip_monitor
|
||||
chown system system /dev/logbuffer_maxfg_secondary_monitor
|
||||
chown system system /dev/logbuffer_maxq
|
||||
chown system system /dev/logbuffer_rtx
|
||||
chown system system /dev/logbuffer_ssoc
|
||||
|
@ -469,6 +487,9 @@ on early-boot
|
|||
chown system system /dev/logbuffer_pca9468
|
||||
chown system system /dev/logbuffer_cpm
|
||||
chown system system /dev/logbuffer_bd
|
||||
chown system system /dev/logbuffer_dual_batt
|
||||
chown system system /dev/logbuffer_pcie0
|
||||
chown system system /dev/logbuffer_pcie1
|
||||
|
||||
on boot
|
||||
|
||||
|
@ -654,6 +675,13 @@ on property:vendor.device.modules.ready=1
|
|||
chown system system /sys/devices/virtual/sec/tsp/cmd
|
||||
chown system system /sys/devices/virtual/sec/tsp/cmd_result
|
||||
chown system system /sys/devices/virtual/sec/tsp/status
|
||||
chown system system /proc/goog_touch_interface/gti.0
|
||||
chown system system /proc/goog_touch_interface/gti.0/ms_base
|
||||
chown system system /proc/goog_touch_interface/gti.0/ms_diff
|
||||
chown system system /proc/goog_touch_interface/gti.0/ms_raw
|
||||
chown system system /proc/goog_touch_interface/gti.0/ss_base
|
||||
chown system system /proc/goog_touch_interface/gti.0/ss_diff
|
||||
chown system system /proc/goog_touch_interface/gti.0/ss_raw
|
||||
# Allow access to touch
|
||||
chown system input /dev/touch_offload
|
||||
chmod 660 /dev/touch_offload
|
||||
|
|
|
@ -622,6 +622,7 @@ PRODUCT_COPY_FILES += \
|
|||
frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\
|
||||
frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml\
|
||||
vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.preview-dis.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.preview-dis.xml\
|
||||
vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.stream-usecase.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.stream-usecase.xml\
|
||||
|
||||
#PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
|
||||
|
@ -1067,11 +1068,19 @@ $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT))
|
|||
|
||||
#
|
||||
## Audio properties
|
||||
ifneq (,$(filter $(TANGOR_PRODUCT), $(TARGET_PRODUCT)))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.config.vc_call_vol_steps=7 \
|
||||
ro.config.media_vol_steps=20 \
|
||||
ro.audio.monitorRotation = true \
|
||||
ro.audio.offload_wakelock=false
|
||||
else
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.config.vc_call_vol_steps=7 \
|
||||
ro.config.media_vol_steps=25 \
|
||||
ro.audio.monitorRotation = true \
|
||||
ro.audio.offload_wakelock=false
|
||||
endif
|
||||
|
||||
# vndservicemanager and vndservice no longer included in API 30+, however needed by vendor code.
|
||||
# See b/148807371 for reference
|
||||
|
|
|
@ -161,7 +161,7 @@
|
|||
</hal>
|
||||
<hal format="aidl" optional="true">
|
||||
<name>vendor.google.google_battery</name>
|
||||
<version>1</version>
|
||||
<version>2</version>
|
||||
<interface>
|
||||
<name>IGoogleBattery</name>
|
||||
<instance>default</instance>
|
||||
|
|
|
@ -244,6 +244,7 @@ Dumpstate::Dumpstate()
|
|||
{ "led", [this](int fd) { dumpLEDSection(fd); } },
|
||||
{ "pixel-trace", [this](int fd) { dumpPixelTraceSection(fd); } },
|
||||
{ "perf-metrics", [this](int fd) { dumpPerfMetricsSection(fd); } },
|
||||
{ "pcie", [this](int fd) { dumpPCIeSection(fd); } },
|
||||
},
|
||||
mLogSections{
|
||||
{ "modem", [this](int fd, const std::string &destDir) { dumpModemLogs(fd, destDir); } },
|
||||
|
@ -330,12 +331,13 @@ void Dumpstate::dumpPowerSection(int fd) {
|
|||
DumpFileToFd(fd, "maxfg", "/dev/logbuffer_maxfg_monitor");
|
||||
} else {
|
||||
DumpFileToFd(fd, "Power supply property maxfg_base", "/sys/class/power_supply/maxfg_base/uevent");
|
||||
DumpFileToFd(fd, "Power supply property maxfg_flip", "/sys/class/power_supply/maxfg_flip/uevent");
|
||||
DumpFileToFd(fd, "Power supply property maxfg_secondary", "/sys/class/power_supply/maxfg_secondary/uevent");
|
||||
DumpFileToFd(fd, "m5_state", "/sys/class/power_supply/maxfg_base/m5_model_state");
|
||||
DumpFileToFd(fd, "maxfg_base", "/dev/logbuffer_maxfg_base");
|
||||
DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip");
|
||||
DumpFileToFd(fd, "maxfg_secondary", "/dev/logbuffer_maxfg_secondary");
|
||||
DumpFileToFd(fd, "maxfg_base", "/dev/logbuffer_maxfg_base_monitor");
|
||||
DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip_monitor");
|
||||
DumpFileToFd(fd, "maxfg_secondary", "/dev/logbuffer_maxfg_secondary_monitor");
|
||||
DumpFileToFd(fd, "google_dual_batt", "/dev/logbuffer_dual_batt");
|
||||
}
|
||||
|
||||
if (!stat("/dev/maxfg_history", &buffer)) {
|
||||
|
@ -430,6 +432,8 @@ void Dumpstate::dumpPowerSection(int fd) {
|
|||
RunCommandToFd(fd, "Battery EEPROM", {"/vendor/bin/sh", "-c", "xxd /sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom"});
|
||||
} else if (!stat("/sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom", &buffer)) {
|
||||
RunCommandToFd(fd, "Battery EEPROM", {"/vendor/bin/sh", "-c", "xxd /sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom"});
|
||||
} else if (!stat("/sys/devices/platform/10da0000.hsi2c/i2c-5/5-0050/eeprom", &buffer)) {
|
||||
RunCommandToFd(fd, "Battery EEPROM", {"/vendor/bin/sh", "-c", "xxd /sys/devices/platform/10da0000.hsi2c/i2c-5/5-0050/eeprom"});
|
||||
} else if (!stat("/sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom", &buffer)) {
|
||||
RunCommandToFd(fd, "Battery EEPROM", {"/vendor/bin/sh", "-c", "xxd /sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom"});
|
||||
} else if (!stat("/sys/devices/platform/10da0000.hsi2c/i2c-7/7-0050/eeprom", &buffer)) {
|
||||
|
@ -536,6 +540,7 @@ void Dumpstate::dumpTouchSection(int fd) {
|
|||
const char syna_cmd_path[] = "/sys/class/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs";
|
||||
const char focaltech_cmd_path[] = "/proc/focaltech_touch";
|
||||
const char gti0_cmd_path[] = "/sys/devices/virtual/goog_touch_interface/gti.0";
|
||||
const char gti0_procfs_path[] = "/proc/goog_touch_interface/gti.0";
|
||||
char cmd[256];
|
||||
|
||||
if (!access(focaltech_cmd_path, R_OK)) {
|
||||
|
@ -867,6 +872,10 @@ void Dumpstate::dumpTouchSection(int fd) {
|
|||
}
|
||||
|
||||
if (!access(gti0_cmd_path, R_OK)) {
|
||||
const char *heatmap_path = gti0_cmd_path;
|
||||
|
||||
if (!access(gti0_procfs_path, R_OK))
|
||||
heatmap_path = gti0_procfs_path;
|
||||
::android::base::WriteStringToFd("\n<<<<<< GTI0 >>>>>>\n\n", fd);
|
||||
|
||||
// Enable: force touch active
|
||||
|
@ -878,27 +887,27 @@ void Dumpstate::dumpTouchSection(int fd) {
|
|||
DumpFileToFd(fd, "Touch Firmware Version", cmd);
|
||||
|
||||
// Get Mutual Sensing Data - Baseline
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ms_base", gti0_cmd_path);
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ms_base", heatmap_path);
|
||||
RunCommandToFd(fd, "Get Mutual Sensing Data - Baseline", {"/vendor/bin/sh", "-c", cmd});
|
||||
|
||||
// Get Mutual Sensing Data - Delta
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ms_diff", gti0_cmd_path);
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ms_diff", heatmap_path);
|
||||
RunCommandToFd(fd, "Get Mutual Sensing Data - Delta", {"/vendor/bin/sh", "-c", cmd});
|
||||
|
||||
// Get Mutual Sensing Data - Raw
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ms_raw", gti0_cmd_path);
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ms_raw", heatmap_path);
|
||||
RunCommandToFd(fd, "Get Mutual Sensing Data - Raw", {"/vendor/bin/sh", "-c", cmd});
|
||||
|
||||
// Get Self Sensing Data - Baseline
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ss_base", gti0_cmd_path);
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ss_base", heatmap_path);
|
||||
RunCommandToFd(fd, "Get Self Sensing Data - Baseline", {"/vendor/bin/sh", "-c", cmd});
|
||||
|
||||
// Get Self Sensing Data - Delta
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ss_diff", gti0_cmd_path);
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ss_diff", heatmap_path);
|
||||
RunCommandToFd(fd, "Get Self Sensing Data - Delta", {"/vendor/bin/sh", "-c", cmd});
|
||||
|
||||
// Get Self Sensing Data - Raw
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ss_raw", gti0_cmd_path);
|
||||
snprintf(cmd, sizeof(cmd), "cat %s/ss_raw", heatmap_path);
|
||||
RunCommandToFd(fd, "Get Self Sensing Data - Raw", {"/vendor/bin/sh", "-c", cmd});
|
||||
|
||||
// Self Test
|
||||
|
@ -1050,15 +1059,24 @@ void Dumpstate::dumpStorageSection(int fd) {
|
|||
|
||||
// Dump items related to display
|
||||
void Dumpstate::dumpDisplaySection(int fd) {
|
||||
DumpFileToFd(fd, "CRTC-0 underrun count", "/sys/kernel/debug/dri/0/crtc-0/underrun_cnt");
|
||||
DumpFileToFd(fd, "CRTC-0 crc count", "/sys/kernel/debug/dri/0/crtc-0/crc_cnt");
|
||||
DumpFileToFd(fd, "CRTC-0 ecc count", "/sys/kernel/debug/dri/0/crtc-0/ecc_cnt");
|
||||
DumpFileToFd(fd, "CRTC-0 idma err count", "/sys/kernel/debug/dri/0/crtc-0/idma_err_cnt");
|
||||
// Dump counters for decon drivers
|
||||
const std::string decon_device_sysfs_path("/sys/class/drm/card0/device/");
|
||||
for(int i = 0; i <= 2; ++i){
|
||||
const std::string decon_num_str = std::to_string(i);
|
||||
const std::string decon_counter_path = decon_device_sysfs_path +
|
||||
"decon" + decon_num_str +
|
||||
"/counters";
|
||||
if (access(decon_counter_path.c_str(), R_OK) == 0){
|
||||
DumpFileToFd(fd, "DECON-" + decon_num_str + " counters",
|
||||
decon_counter_path);
|
||||
}
|
||||
else{
|
||||
::android::base::WriteStringToFd("No counters for DECON-" +
|
||||
decon_num_str + " found at path (" + decon_counter_path + ")\n",
|
||||
fd);
|
||||
}
|
||||
}
|
||||
DumpFileToFd(fd, "CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event");
|
||||
DumpFileToFd(fd, "CRTC-1 underrun count", "/sys/kernel/debug/dri/0/crtc-1/underrun_cnt");
|
||||
DumpFileToFd(fd, "CRTC-1 crc count", "/sys/kernel/debug/dri/0/crtc-1/crc_cnt");
|
||||
DumpFileToFd(fd, "CRTC-1 ecc count", "/sys/kernel/debug/dri/0/crtc-1/ecc_cnt");
|
||||
DumpFileToFd(fd, "CRTC-1 idma err count", "/sys/kernel/debug/dri/0/crtc-1/idma_err_cnt");
|
||||
DumpFileToFd(fd, "CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event");
|
||||
RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"},
|
||||
CommandOptions::WithTimeout(2).Build());
|
||||
|
@ -1189,6 +1207,15 @@ void Dumpstate::dumpLEDSection(int fd) {
|
|||
}
|
||||
}
|
||||
|
||||
void Dumpstate::dumpPCIeSection(int fd) {
|
||||
DumpFileToFd(fd, "PCIe0 Logs", "/dev/logbuffer_pcie0");
|
||||
DumpFileToFd(fd, "PCIe1 Logs", "/dev/logbuffer_pcie1");
|
||||
RunCommandToFd(fd, "PCIe Link Statistics", {"/vendor/bin/sh", "-c",
|
||||
"for f in ls /sys/devices/platform/14520000.pcie/link_stats/* "
|
||||
" /sys/devices/platform/11920000.pcie/link_stats/*; do "
|
||||
" echo \"$f: `cat $f`\"; done"});
|
||||
}
|
||||
|
||||
void Dumpstate::dumpModemSection(int fd) {
|
||||
DumpFileToFd(fd, "Modem Stat", "/data/vendor/modem_stat/debug.txt");
|
||||
RunCommandToFd(fd, "Modem SSR history", {"/vendor/bin/sh", "-c",
|
||||
|
@ -1395,7 +1422,7 @@ ndk::ScopedAStatus Dumpstate::dumpstateBoard(const std::vector<::ndk::ScopedFile
|
|||
"Invalid mode");
|
||||
}
|
||||
|
||||
if (in_fds.size() < 1) {
|
||||
if (in_fds.size() < 2) {
|
||||
ALOGE("no FD for dumpstate_board binary\n");
|
||||
} else {
|
||||
int fd_bin = in_fds[1].get();
|
||||
|
|
|
@ -72,6 +72,7 @@ class Dumpstate : public BnDumpstateDevice {
|
|||
void dumpLEDSection(int fd);
|
||||
void dumpPixelTraceSection(int fd);
|
||||
void dumpPerfMetricsSection(int fd);
|
||||
void dumpPCIeSection(int fd);
|
||||
|
||||
void dumpLogSection(int fd, int fdModem);
|
||||
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -133,7 +133,7 @@
|
|||
</hal>
|
||||
<hal format="aidl">
|
||||
<name>vendor.google.google_battery</name>
|
||||
<version>1</version>
|
||||
<version>2</version>
|
||||
<interface>
|
||||
<name>IGoogleBattery</name>
|
||||
<instance>default</instance>
|
||||
|
|
|
@ -289,4 +289,10 @@
|
|||
<item>"com.shannon.imsservice"</item>
|
||||
<item>"com.android.phone"</item>
|
||||
</string-array>
|
||||
|
||||
<!-- The list of packages to force slowJpegMode for Apps using Camera API1 -->
|
||||
<string-array name="config_forceSlowJpegModeList" translatable="false">
|
||||
<item>com.facebook.orca</item>
|
||||
<item>com.skype.raider</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
|
|
|
@ -70,7 +70,9 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
|
|||
.CCARatePath = "/sys/devices/platform/audiometrics/cca_rate_read_once",
|
||||
.TempResidencyPath = "/sys/kernel/metrics/temp_residency/temp_residency_all/stats",
|
||||
.ResumeLatencyMetricsPath = "/sys/kernel/metrics/resume_latency/resume_latency_metrics",
|
||||
.LongIRQMetricsPath = "/sys/kernel/metrics/irq/long_irq_metrics"
|
||||
.LongIRQMetricsPath = "/sys/kernel/metrics/irq/long_irq_metrics",
|
||||
.ModemPcieLinkStatsPath = "/sys/devices/platform/11920000.pcie/link_stats",
|
||||
.WifiPcieLinkStatsPath = "/sys/devices/platform/14520000.pcie/link_stats"
|
||||
};
|
||||
|
||||
const struct UeventListener::UeventPaths ueventPaths = {
|
||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue