summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-13 00:05:13 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-13 00:05:13 +0000
commit2c7e671ecd3609055275c31c027835d25f0b9153 (patch)
tree00912d293542be2933f0cb5a6e6e5569c3c3d9c0
parent0a493ec75db6519fe5a051cd1360ae658f382def (diff)
parent84128834583cb62308d1daddc3ebb1fbc538cce2 (diff)
downloadgs201-2c7e671ecd3609055275c31c027835d25f0b9153.tar.gz
Snap for 11211173 from 84128834583cb62308d1daddc3ebb1fbc538cce2 to 24Q1-release
Change-Id: I307a100412c75673a2801b81e5a3712d27890c03
-rw-r--r--conf/init.gs201.usb.rc2
-rw-r--r--device.mk2
-rw-r--r--pixelstats/service.cpp5
3 files changed, 6 insertions, 3 deletions
diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc
index 6a52fb0..9ba9eb8 100644
--- a/conf/init.gs201.usb.rc
+++ b/conf/init.gs201.usb.rc
@@ -371,6 +371,8 @@ on boot
write sys/module/usbcore/parameters/initial_descriptor_timeout 500
# Use USB Gadget HAL
setprop sys.usb.configfs 2
+ # Enable in-kernel media-presence polling for SD cards
+ write /sys/module/block/parameters/events_dfl_poll_msecs 2000
on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb && property:sys.usb.configfs=1
write /config/usb_gadget/g1/idProduct 0x4EE7
diff --git a/device.mk b/device.mk
index fd91d88..d15c21d 100644
--- a/device.mk
+++ b/device.mk
@@ -192,7 +192,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Carrier configuration default location
PRODUCT_PROPERTY_OVERRIDES += \
- persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack
+ persist.vendor.radio.config.carrier_config_dir=/vendor/firmware/carrierconfig
PRODUCT_PROPERTY_OVERRIDES += \
telephony.active_modems.max_count=2
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 5d739b1..ab6f85f 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -71,7 +71,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
"/sys/devices/platform/100b0000.TPU/trip_counter",
"/sys/devices/platform/100b0000.AUR/trip_counter",
},
- .CCARatePath = "/sys/devices/platform/audiometrics/cca_rate_read_once",
+ .CCARatePath = "/sys/devices/platform/audiometrics/cca_count_read_once",
.TempResidencyAndResetPaths = {
{
"/sys/kernel/metrics/thermal/tr_by_group/tmu/stats",
@@ -88,7 +88,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
.IRQStatsResetPath = "/sys/kernel/metrics/irq/stats_reset",
.ModemPcieLinkStatsPath = "/sys/devices/platform/11920000.pcie/link_stats",
.WifiPcieLinkStatsPath = "/sys/devices/platform/14520000.pcie/link_stats",
- .GMSRPath = "/sys/class/power_supply/maxfg/gmsr"
+ .GMSRPath = "/sys/class/power_supply/maxfg/gmsr",
+ .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count"
};
const struct UeventListener::UeventPaths ueventPaths = {