diff --git a/conf/init.persist.rc b/conf/init.persist.rc
index 800a611..271910a 100644
--- a/conf/init.persist.rc
+++ b/conf/init.persist.rc
@@ -36,6 +36,7 @@ on property:ro.fstype.data=* && property:ro.vendor.persist.status=mounted
symlink /mnt/vendor/persist/ss /data/vendor/ss/persist
chown root system /data/vendor/ss/persist
chmod 0770 /data/vendor/ss/persist
+ symlink /dev/block/platform/13200000\.ufs/by-name/trusty_persist /data/vendor/ss/persist/0
chown system system /data/vendor/ss/0
chown system system /data/vendor/ss/persist/0
chown system system /data/vendor/ss/persist/nsp
diff --git a/device.mk b/device.mk
index 67d5de0..189563a 100644
--- a/device.mk
+++ b/device.mk
@@ -613,6 +613,10 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
+ifneq (,$(filter ripcurrentpro, $(TARGET_PRODUCT)))
+ include device/google/gs-common/touch/gti/gti.mk
+endif
+
# Sensors
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
@@ -1229,6 +1233,10 @@ PRODUCT_PACKAGES += \
# pKVM
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
PRODUCT_BUILD_PVMFW_IMAGE := true
+ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
+ # Set the environment variable to enable the Secretkeeper HAL service.
+ SECRETKEEPER_ENABLED := true
+endif
# Enable to build standalone vendor_kernel_boot image.
PRODUCT_BUILD_VENDOR_KERNEL_BOOT_IMAGE := true
diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp
index 1b84f5e..24e5cf2 100644
--- a/dumpstate/dump_power.cpp
+++ b/dumpstate/dump_power.cpp
@@ -177,7 +177,7 @@ void dumpPowerSupplyStats() {
void dumpMaxFg() {
const char *maxfgLoc = "/sys/class/power_supply/maxfg";
const char *max77779fgDir = "/sys/class/power_supply/max77779fg";
-
+ const char *maxfgDualLoc = "/sys/class/power_supply/maxfg_base";
const char *maxfg [][2] = {
{"Power supply property maxfg", "/sys/class/power_supply/maxfg/uevent"},
{"maxfg registers", "/sys/class/power_supply/maxfg/registers_dump"},
@@ -194,16 +194,17 @@ void dumpMaxFg() {
{"max77779fg_monitor logbuffer", "/dev/logbuffer_max77779fg_monitor"},
};
- const char *maxfgSecondary [][2] = {
+ const char *maxfgDual [][2] = {
{"Power supply property maxfg_base", "/sys/class/power_supply/maxfg_base/uevent"},
{"Power supply property maxfg_secondary", "/sys/class/power_supply/maxfg_secondary/uevent"},
{"maxfg_base registers", "/sys/class/power_supply/maxfg_base/registers_dump"},
{"maxfg_secondary registers", "/sys/class/power_supply/maxfg_secondary/registers_dump"},
{"model_state", "/sys/class/power_supply/maxfg_base/model_state"},
- {"maxfg_base", "/dev/logbuffer_maxfg_base"},
- {"maxfg_secondary", "/dev/logbuffer_maxfg_secondary"},
+ {"maxfg_base logbuffer", "/dev/logbuffer_maxfg_base"},
+ {"maxfg_secondary logbuffer", "/dev/logbuffer_maxfg_secondary"},
{"maxfg_base_monitor logbuffer", "/dev/logbuffer_maxfg_base_monitor"},
{"maxfg_secondary_monitor logbuffer", "/dev/logbuffer_maxfg_secondary_monitor"},
+ {"dual_batt logbuffer", "/dev/logbuffer_dual_batt"},
};
const char *maxfgHistoryName = "Maxim FG History";
@@ -220,14 +221,13 @@ void dumpMaxFg() {
for (const auto &row : max77779fgFiles) {
dumpFileContent(row[0], row[1]);
}
- } else {
- for (const auto &row : maxfgSecondary) {
+ } else if (isValidDir(maxfgDualLoc)){
+ for (const auto &row : maxfgDual) {
dumpFileContent(row[0], row[1]);
}
- }
-
- if (isValidFile(maxfgHistoryDir)) {
- dumpFileContent(maxfgHistoryName, maxfgHistoryDir);
+ if (isValidFile(maxfgHistoryDir)) {
+ dumpFileContent(maxfgHistoryName, maxfgHistoryDir);
+ }
}
}
@@ -317,7 +317,9 @@ void dumpPdEngine() {
{"TCPC logbuffer", "/dev/logbuffer_usbpd"},
{"pogo_transport logbuffer", "/dev/logbuffer_pogo_transport"},
{"PPS-google_cpm logbuffer", "/dev/logbuffer_cpm"},
- {"PPS-dc logbuffer", "/dev/logbuffer_dc_mains"}
+ {"PPS-pca9468 logbuffer", "/dev/logbuffer_pca9468"},
+ {"PPS-ln8411 logbuffer", "/dev/logbuffer_ln8411"},
+ {"PPS-dc_mains logbuffer", "/dev/logbuffer_dc_mains"}
};
for (const auto &row : pdEngine) {
@@ -433,11 +435,8 @@ void printValuesOfDirectory(const char *directory, std::string debugfs, const ch
void dumpChg() {
const std::string pmic_bus = "/sys/devices/platform/108d0000.hsi2c/i2c-6/6-0066";
- const std::string pmic_bus_dev = "/sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0066";
const char* chg_reg_dump_file = "/sys/class/power_supply/main-charger/device/registers_dump";
const std::string chg_name_file = "/sys/class/power_supply/main-charger/device/name";
- const std::string pmic_name_file_dev = pmic_bus_dev + "/name";
- const std::string pmic_reg_dump_dev_file = pmic_bus_dev + "/registers_dump";
const std::string pmic_name_file = pmic_bus + "/name";
const std::string pmic_reg_dump_file = pmic_bus + "/registers_dump";
const std::string reg_dump_str = " registers dump";
@@ -462,10 +461,6 @@ void dumpChg() {
if (isValidDir(pmic_bus.c_str())) {
ret = android::base::ReadFileToString(pmic_name_file, &pmic_name);
pmic_reg_dump = pmic_reg_dump_file;
- } else {
- /* DEV device */
- ret = android::base::ReadFileToString(pmic_name_file_dev, &pmic_name);
- pmic_reg_dump = pmic_reg_dump_dev_file;
}
if (ret && !pmic_name.empty()) {
@@ -483,36 +478,16 @@ void dumpChg() {
void dumpChgUserDebug() {
const std::string debugfs = "/d/";
- const char *maxFgDir = "/d/maxfg";
- const char *maxFgStrMatch = "maxfg";
const char *maxBaseFgDir = "/d/maxfg_base";
const char *maxBaseFgStrMatch = "maxfg_base";
- const char *maxSecFgDir = "/d/maxfg_secondary";
- const char *maxSecFgStrMatch = "maxfg_secondary";
const char *max77779FgDir = "/d/max77779fg";
const char *maxFg77779StrMatch = "max77779fg";
const char *chgTblName = "Charging table dump";
const char *chgTblDir = "/d/google_battery/chg_raw_profile";
- const char *maxFgInfo [] {
- "fg_model",
- "algo_ver",
- "model_ok",
- "registers",
- "nv_registers",
- };
-
const char *max77779FgInfo [] {
"fg_model",
- "algo_ver",
"model_ok",
- "registers",
- "debug_registers",
- };
-
- const char *max1720xFgInfo [] {
- "registers",
- "nv_registers",
};
if (isUserBuild())
@@ -520,11 +495,7 @@ void dumpChgUserDebug() {
dumpFileContent(chgTblName, chgTblDir);
- if (isValidDir(maxFgDir)) {
- for (auto & directory : maxFgInfo) {
- printValuesOfDirectory(directory, debugfs, maxFgStrMatch);
- }
- } else if (isValidDir(max77779FgDir)) {
+ if (isValidDir(max77779FgDir)) {
for (auto & directory : max77779FgInfo) {
printValuesOfDirectory(directory, debugfs, maxFg77779StrMatch);
}
@@ -532,11 +503,6 @@ void dumpChgUserDebug() {
for (auto & directory : max77779FgInfo) {
printValuesOfDirectory(directory, debugfs, maxBaseFgStrMatch);
}
- if (isValidDir(maxSecFgDir)) {
- for (auto & directory : max1720xFgInfo) {
- printValuesOfDirectory(directory, debugfs, maxSecFgStrMatch);
- }
- }
}
}
diff --git a/dumpstate/dump_power.rc b/dumpstate/dump_power.rc
index d70c021..5a01b3d 100644
--- a/dumpstate/dump_power.rc
+++ b/dumpstate/dump_power.rc
@@ -97,6 +97,7 @@ on early-boot
chown system system /dev/logbuffer_maxfg_secondary
chown system system /dev/logbuffer_maxfg_base_monitor
chown system system /dev/logbuffer_maxfg_secondary_monitor
+ chown system system /dev/logbuffer_dual_batt
chown system system /dev/logbuffer_maxq
chown system system /dev/logbuffer_rtx
chown system system /dev/logbuffer_ssoc
@@ -105,6 +106,8 @@ on early-boot
chown system system /dev/logbuffer_usbpd
chown system system /dev/logbuffer_pogo_transport
chown system system /dev/logbuffer_wireless
+ chown system system /dev/logbuffer_pca9468
+ chown system system /dev/logbuffer_ln8411
chown system system /dev/logbuffer_dc_mains
chown system system /dev/logbuffer_cpm
chown system system /dev/logbuffer_wc68
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6e2772c..4f901e7 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -536,4 +536,8 @@
com.google.android.apps.stargate.sessionmanager.SessionManagerReceiver_Receiver
+
+
+ false