Snap for 11504269 from 28a906e86a
to 24Q3-release
Change-Id: Id8cd3f58fee06428f145c83bc8688924e604daad
This commit is contained in:
commit
805e2a1a96
3 changed files with 20 additions and 3 deletions
|
@ -89,6 +89,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
|
||||||
# Set the environment variable to switch the Keymint HAL service to Rust
|
# Set the environment variable to switch the Keymint HAL service to Rust
|
||||||
TRUSTY_KEYMINT_IMPL := rust
|
TRUSTY_KEYMINT_IMPL := rust
|
||||||
|
|
||||||
|
ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
|
||||||
|
# Set the environment variable to enable the Secretkeeper HAL service.
|
||||||
|
SECRETKEEPER_ENABLED := true
|
||||||
|
endif
|
||||||
|
|
||||||
# OEM Unlock reporting
|
# OEM Unlock reporting
|
||||||
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
|
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
|
||||||
ro.oem_unlock_supported=1
|
ro.oem_unlock_supported=1
|
||||||
|
@ -1192,8 +1197,8 @@ include device/google/gs-common/pixel_ril/ril.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Touch service
|
# Touch service
|
||||||
include hardware/google/pixel/input/twoshay.mk
|
|
||||||
include device/google/gs-common/touch/twoshay/aidl_zuma.mk
|
include device/google/gs-common/touch/twoshay/aidl_zuma.mk
|
||||||
|
include device/google/gs-common/touch/twoshay/twoshay.mk
|
||||||
|
|
||||||
# Allow longer timeout for incident report generation in bugreport
|
# Allow longer timeout for incident report generation in bugreport
|
||||||
# Overriding in /product partition instead of /vendor intentionally,
|
# Overriding in /product partition instead of /vendor intentionally,
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
on property:sys.boot_completed=1
|
on property:sys.boot_completed=1
|
||||||
|
chown system system /sys/class/power_supply/maxfg_base/fg_learning_events
|
||||||
|
chown system system /sys/class/power_supply/maxfg/fg_learning_events
|
||||||
start vendor.pixelstats_vendor
|
start vendor.pixelstats_vendor
|
||||||
on post-fs-data
|
on post-fs-data
|
||||||
chown system system /sys/kernel/metrics/irq/stats_reset
|
chown system system /sys/kernel/metrics/irq/stats_reset
|
||||||
|
|
|
@ -122,7 +122,17 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
|
||||||
|
|
||||||
const struct UeventListener::UeventPaths ueventPaths = {
|
const struct UeventListener::UeventPaths ueventPaths = {
|
||||||
.AudioUevent = "/devices/virtual/amcs/amcs",
|
.AudioUevent = "/devices/virtual/amcs/amcs",
|
||||||
.TypeCPartnerUevent = "PRODUCT_TYPE="};
|
.TypeCPartnerUevent = "PRODUCT_TYPE=",
|
||||||
|
.FGLearningPath = {
|
||||||
|
"/sys/class/power_supply/maxfg/fg_learning_events",
|
||||||
|
"/sys/class/power_supply/maxfg_base/fg_learning_events"
|
||||||
|
},
|
||||||
|
.FwUpdatePath = "",
|
||||||
|
.FGModelLoadingPath = {
|
||||||
|
"/sys/class/power_supply/maxfg/m5_model_state",
|
||||||
|
"/sys/class/power_supply/maxfg_base/m5_model_state"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
LOG(INFO) << "starting PixelStats";
|
LOG(INFO) << "starting PixelStats";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue