Snap for 8005954 from 849a14f5437f44ffbd752dbe18edb23b3d304611 to sdk-release
Change-Id: Ied9fb270379f436bd7146314feef0c1f262a0a70
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 693d733..149a44e 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -509,10 +509,11 @@
device/google/redbull/modules.blocklist:$(TARGET_COPY_OUT_VENDOR)/lib/modules/modules.blocklist \
device/google/redbull/init.insmod.charger.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.charger.cfg \
-# TARGET_BOOLOADER_BOARD_NAME sensitive common boilerplate
-
+# TARGET_BOOTLOADER_BOARD_NAME sensitive common boilerplate
+# We can't use a variable as the prefix to an include statement
+# because it makes it too difficult to convert to starlark
TARGET_BOARD_NAME_DIR := device/google/$(TARGET_BOOTLOADER_BOARD_NAME)
--include $(TARGET_BOARD_NAME_DIR:%/=%)-sepolicy/$(TARGET_BOOTLOADER_BOARD_NAME)-sepolicy.mk
+-include device/google/$(TARGET_BOOTLOADER_BOARD_NAME)-sepolicy/$(TARGET_BOOTLOADER_BOARD_NAME)-sepolicy.mk
TARGET_BOARD_INFO_FILE := $(TARGET_BOARD_NAME_DIR)/board-info.txt
TARGET_BOARD_COMMON_PATH := $(TARGET_BOARD_NAME_DIR)/sm7250
@@ -521,7 +522,7 @@
ifneq (,$(filter $(TARGET_DEVICE),bramble redfin))
TARGET_KERNEL_DIR := device/google/redbull-kernel
else
- TARGET_KERNEL_DIR := $(TARGET_BOARD_NAME_DIR:%/=%)-kernel
+ TARGET_KERNEL_DIR := $(TARGET_BOARD_NAME_DIR)-kernel
endif
# DTBO partition definitions
diff --git a/device-common.mk b/device-common.mk
index ca96da3..eeb6e80 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -482,6 +482,10 @@
PRODUCT_PROPERTY_OVERRIDES += \
vendor.media.omx=0 \
+# Media Performance Class 11
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.odm.build.media_performance_class=30
+
# Enable ECO service
QC2_HAVE_ECO_SERVICE := true
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index fb74ef8..712da53 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -42,10 +42,13 @@
.UFSLifetimeA = UFSHC_PATH(health_descriptor/life_time_estimation_a),
.UFSLifetimeB = UFSHC_PATH(health_descriptor/life_time_estimation_b),
.UFSLifetimeC = UFSHC_PATH(health_descriptor/life_time_estimation_c),
- .UFSHostResetPath = UFSHC_PATH(err_stats/err_host_reset),
.F2fsStatsPath = "/sys/fs/f2fs/",
- .EEPROMPath = "/dev/battery_history"
+ .EEPROMPath = "/dev/battery_history",
+ .UFSErrStatsPath = {
+ UFSHC_PATH(err_stats/err_host_reset)
+ }
};
+
const struct UeventListener::UeventPaths ueventPaths = {
.AudioUevent = "/kernel/q6audio/q6voice_uevent",
.WirelessChargerPtmcUevent = "POWER_SUPPLY_PTMC_ID="};
