diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 73eafa2f..624b7a93 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -95,9 +95,6 @@ endif
ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
AB_OTA_PARTITIONS += vbmeta
endif
-ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false)
-AB_OTA_PARTITIONS += pvmfw
-endif
# EMULATOR common modules
BOARD_EMULATOR_COMMON_MODULES := liblight
@@ -383,4 +380,4 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K
# Protected VM firmware
BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
--include vendor/google_devices/gs101/proprietary/BoardConfigVendor.mk
+-include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 84d55d69..f0c07911 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -257,6 +257,10 @@ on init
# Google Charger stats (write 0)
chown system system /sys/devices/platform/google,charger/charge_stats
+ # Permission for wireless charging fan
+ chown system system /sys/devices/platform/google,charger/thermal_dc_fan_alarm
+ chown system system /sys/devices/platform/google,cpm/thermal_mdis_fan_alarm
+
# Permission for wireless charging
chown system system /sys/class/power_supply/wireless/capacity
chown system system /sys/class/power_supply/wireless/device/rtx
@@ -651,6 +655,8 @@ service gnss_service /vendor/bin/hw/android.hardware.gnss@2.1-service-brcm
class hal
user gps
group system gps radio
+ ioprio be 0
+ priority -1
# disable gps service if no gps h/w
on property:vendor.ril.cbd.svc=0
@@ -972,6 +978,18 @@ on charger
write /proc/vendor_sched/sys_uclamp_min 0
write /proc/vendor_sched/sys_prefer_idle 0
+ # Use charger thermal config
+ setprop vendor.thermal.config "thermal_info_config_charge.json"
+
+ # Wait for insmod_sh to finish all common modules
+ wait_for_prop vendor.common.modules.ready 1
+
+ # Create thermal symlink in off charging mode
+ mkdir /dev/thermal 0750 system system
+ mkdir /dev/thermal/tz-by-name 0750 system system
+ mkdir /dev/thermal/cdev-by-name 0750 system system
+ start vendor.thermal.symlinks
+
on property:vendor.disable.bcl.control=1
write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0
diff --git a/default-permissions.xml b/default-permissions.xml
index 4765cb23..d65d7aaf 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -113,6 +113,8 @@
+
+
diff --git a/device-common.mk b/device-common.mk
index d9522989..cc373466 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -47,7 +47,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
# ZramWriteback
-include hardware/google/pixel/mm/device_gki.mk
-
-# Set thermal warm reset
-PRODUCT_PRODUCT_PROPERTIES += \
- ro.thermal_warmreset = true
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index c007ae20..a9f026ee 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -58,6 +58,7 @@
com.google.face.debug
+ 2
IDebugHost
default
@@ -121,6 +122,7 @@
hardware.qorvo.uwb
+ 2
IUwbVendor
default
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index e20065ae..cbe997ed 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -976,7 +976,8 @@ void DumpstateDevice::dumpAoCSection(int fd) {
DumpFileToFd(fd, "AoC logging wake", "/sys/devices/platform/19000000.aoc/control/logging_wakeup");
DumpFileToFd(fd, "AoC hotword wake", "/sys/devices/platform/19000000.aoc/control/hotword_wakeup");
DumpFileToFd(fd, "AoC memory exception wake", "/sys/devices/platform/19000000.aoc/control/memory_exception");
- DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes");
+ DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes_a32");
+ DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes_ff1");
RunCommandToFd(fd, "AoC Heap Stats (A32)",
{"/vendor/bin/sh", "-c", "echo 'dbg heap -c 1' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"},
CommandOptions::WithTimeout(1).Build());
@@ -989,9 +990,6 @@ void DumpstateDevice::dumpAoCSection(int fd) {
RunCommandToFd(fd, "AoC Heap Stats (HF1)",
{"/vendor/bin/sh", "-c", "echo 'dbg heap -c 4' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"},
CommandOptions::WithTimeout(1).Build());
- RunCommandToFd(fd, "AoC MIF Stats",
- {"/vendor/bin/sh", "-c", "echo 'mif details' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"},
- CommandOptions::WithTimeout(1).Build());
}
// Dump items related to sensors usf.
@@ -1009,6 +1007,9 @@ void DumpstateDevice::dumpSensorsUSFSection(int fd) {
RunCommandToFd(fd, "USF Registry",
{"/vendor/bin/sh", "-c", "usf_reg_edit save -"},
options);
+ RunCommandToFd(fd, "USF Last Stat Buffer",
+ {"/vendor/bin/sh", "-c", "cat /data/vendor/sensors/debug/stats.history"},
+ options);
}
}
}
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so
index e8709e1e..729c29ec 100755
Binary files a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so and b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so differ
diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm
index 92e111ec..57c040be 100755
Binary files a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm and b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm differ
diff --git a/gnss/47765/bin/flp.default.so b/gnss/47765/bin/flp.default.so
index 14efdc91..55805030 100755
Binary files a/gnss/47765/bin/flp.default.so and b/gnss/47765/bin/flp.default.so differ
diff --git a/gnss/47765/bin/gps.default.so b/gnss/47765/bin/gps.default.so
index f10c5ac0..37d378f5 100755
Binary files a/gnss/47765/bin/gps.default.so and b/gnss/47765/bin/gps.default.so differ
diff --git a/gnss/47765/bin/gpsd b/gnss/47765/bin/gpsd
index eab5908b..ca2001cd 100755
Binary files a/gnss/47765/bin/gpsd and b/gnss/47765/bin/gpsd differ
diff --git a/gnss/47765/bin/lhd b/gnss/47765/bin/lhd
index 14584c07..b1789ec7 100755
Binary files a/gnss/47765/bin/lhd and b/gnss/47765/bin/lhd differ
diff --git a/gnss/47765/bin/scd b/gnss/47765/bin/scd
index a7a7b2db..22d5791a 100755
Binary files a/gnss/47765/bin/scd and b/gnss/47765/bin/scd differ
diff --git a/gnss/47765/config/gps.xml b/gnss/47765/config/gps.xml
index eeb4caa4..40dcd36f 100644
--- a/gnss/47765/config/gps.xml
+++ b/gnss/47765/config/gps.xml
@@ -20,7 +20,9 @@
SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplEnable="true"
- SuplUseApn="true"
+ SuplUseApn="false"
+ SuplUseApnNI="true"
+ SuplDummyCellInfo="true"
SuplUseFwCellInfo="false"
SuplTlsCertDirPath="/etc/security/cacerts"
SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
@@ -57,9 +59,11 @@
CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false"
ReAidingIntervalSec="1200"
+ PpsDevice="/sys/class/pps/pps0/assert_elapsed"
/>
-
+
-
+
@@ -79,7 +79,7 @@ F087FE022102914FF4005101915B220748084B00F13801
009102A101F438F703B000BD4170700080BD8900708989
00805D8A006905800025643A2564095374617274206368
70704170705461736B0A00000000633A5C77735C626F64
-5F3437373631303738335F3534323934315C637573746F
+5F3437373631313336315F3534373834345C637573746F
6D6572735C676F6F676C655C503231466C61677461696C
6D63755C64656C69766572795C53656E736F724875625F
5032315C7372635C6875625F636F6E74726F6C6C65722E
@@ -390,7 +390,7 @@ D00FF298080FF2206140F271673B4642468B2011F48EF2
F22046FEF700FF07E002464FF4D1630FF2F4518F2011F4
5FF2FEF769FC04F5A6620A23C2E9000105F0F00006F00F
0101433A462046BDE8F041FFF7BDBB0000633A5C77735C
-626F645F3437373631303738335F3534323934315C6375
+626F645F3437373631313336315F3534373834345C6375
73746F6D6572735C676F6F676C655C503231466C616774
61696C6D63755C64656C69766572795C53656E736F7248
75625F5032315C7372635C636870705C7472616E73706F
@@ -526,7 +526,7 @@ B590B00C46C17B0FF248420E91817B0D91417B0C91017B
25210378204626F4F1F510B010BD000025643A25640948
232568687520756E6B6E6F776E20726571756573742E20
636D643D2523782C2049443D256868750A00633A5C7773
-5C626F645F3437373631303738335F3534323934315C63
+5C626F645F3437373631313336315F3534373834345C63
7573746F6D6572735C676F6F676C655C503231466C6167
7461696C6D63755C64656C69766572795C53656E736F72
4875625F5032315C7372F19403502E8000635C63687070
@@ -585,7 +585,7 @@ F752DEC007F9D5FFF7CBFFF6E700B583B0022102914FF4
D803B000BDF07E8A000C53890028878A00113280009D32
800025643A256409434850502042617564726174652069
732073657420746F20256C640A0A00633A5C77735C626F
-645F3437373631303738335F3534323934315C63757374
+645F3437373631313336315F3534373834345C63757374
6F6D6572735C676F6F676C655C503231466C6167746169
6C6D63755C64656C69766572795C53656E736F72487562
5F5032315C7372635C73656E736F725F6875622E630000
@@ -679,13 +679,13 @@ E08619AE4210D22946204600F067FF0028F6D510F1040F
B5C90382B0A0F5A86419D500F65C552846FDF7F6DD0600
12D00020009069462846FDF712DE761E012804DB024600
992046FEF79EF82846FDF76FDD002EECD173BD70470000
-633A5C77735C626F645F3437373631303738335F353432
-3934315C637573746F6D6572735C676F6F676C655C5032
+633A5C77735C626F645F3437373631313336315F353437
+3834345C637573746F6D6572735C676F6F676C655C5032
31466C61677461696C6D63755C64656C69766572795C53
656E736F724875625F5032315C7372635C636870705C69
6E636C7564655C636870702F7472616E73706F72742E68
-00633A5C77735C626F645F3437373631303738335F3534
-323934315C637573746F6D6572735C676F6F676C655C50
+00633A5C77735C626F645F3437373631313336315F3534
+373834345C637573746F6D6572735C676F6F676C655C50
3231466C61677461696C6D63755C64656C69766572795C
53656E736F724875625F5032315C7372635C636870705C
706C6174666F726D5C62636D5C42434D343737785C6C69
@@ -695,8 +695,8 @@ B5C90382B0A0F5A86419D500F65C552846FDF7F6DD0600
138EA4B29C42EBD2D26A04EB440302EBC306327C012AF1
D1D6E90223D0E918679F42E7D8E8D39642E4D2E5E7D0E9
1823CDE900230FF27C010FF2100240F21E238F200FF4B1
-F403B0F0BD0000633A5C77735C626F645F343737363130
-3738335F3534323934315C637573746F6D6572735C676F
+F403B0F0BD0000633A5C77735C626F645F343737363131
+3336315F3534373834345C637573746F6D6572735C676F
6F676C655C503231466C61677461696C6D63755C64656C
69766572795C53656E736F724875625F5032315C737263
5C636870705C636C69656E74732E630000000025643A25
@@ -706,7 +706,7 @@ F403B0F0BD0000633A5C77735C626F645F343737363130
21FEF75DF80AE03246294625F420F40120787032462068
3946FEF718F8012003B0F0BD25643A2564094F4F4D2061
742025733A25640A00633A5C77735C626F645F34373736
-31303738335F3534323934315C637573746F6D6572735C
+31313336315F3534373834345C637573746F6D6572735C
676F6F676C655C503231466C61677461696C6D63755C64
656C69766572795C53656E736F724875625F5032315C73
72635C636870705C73657276696365735C6C6F6F706261
@@ -718,8 +718,8 @@ D4FFC6F80600C6F80A103923D6F80600D6F80A10CDE902
0122460E2000908F200FF2B0010FF4C3F32868314604B0
BDE870400E22FDF78CBF10B58B880124012B02D1FFF7BE
FF00E00024204610BD25643A2564094F4F4D2061742025
-733A25640A00633A5C77735C626F645F34373736313037
-38335F3534323934315C637573746F6D6572735C676F6F
+733A25640A00633A5C77735C626F645F34373736313133
+36315F3534373834345C637573746F6D6572735C676F6F
676C655C503231466C61677461696C6D63755C64656C69
766572795C53656E736F724875625F5032315C7372635C
636870705C73657276696365735C74696D6573796E632E
@@ -734,7 +734,7 @@ D13B2001903B230FF280040FF26801009422468B200FF4
314603B0BDE8F043FDF7E2BE10B58A880124012A02D1FF
F7BAFF00E00024204610BD25643A2564094F4F4D206174
2025733A25640A00633A5C77735C626F645F3437373631
-303738335F3534323934315C637573746F6D6572735C67
+313336315F3534373834345C637573746F6D6572735C67
6F6F676C655C503231466C61677461696C6D63755C6465
6C69766572795C53656E736F724875625F5032315C7372
635C636870705C73657276696365735C646973636F7665
@@ -761,7 +761,7 @@ D0CDE9000197230FF2B8020FF2B0118B200FF41BF2FFF7
05CDE90445AD230FF2AC118F200FF4D8F106B0BDE87083
70B50446084615461E46FFF7BEFF3246294620680068BD
E87040FDF797BD00000000633A5C77735C626F645F3437
-373631303738335F3534323934315C637573746F6D6572
+373631313336315F3534373834345C637573746F6D6572
735C676F6F676C655C503231466C61677461696C6D6375
5C64656C69766572795C53656E736F724875625F503231
5C7372635C636870705C73657276696365732E63000000
@@ -788,8 +788,8 @@ D009D31AE001A8009038230FF264020FF250018B2019E0
230FF240020FF22C018E2007E001A8009042230FF22C02
0FF218018F200FF49DF00DF5027D10BC5DF80CFB0FF284
014160704725643A25640950414C3A2025730A0000633A
-5C77735C626F645F3437373631303738335F3534323934
-315C637573746F6D6572735C676F6F676C655C50323146
+5C77735C626F645F3437373631313336315F3534373834
+345C637573746F6D6572735C676F6F676C655C50323146
6C61677461696C6D63755C64656C69766572795C53656E
736F724875625F5032315C7372635C636870705C706C61
74666F726D5C70616C5F6170692E6300000000000001C9
@@ -848,7 +848,7 @@ F7A8FE6089FFF793FE42F654000059FFF7A0FE02200290
32BD13460A4601460248007810F469B000001453890055
47800065478000687B890060D09100354780002B488000
436870704C696E6B5461736B00000000633A5C77735C62
-6F645F3437373631303738335F3534323934315C637573
+6F645F3437373631313336315F3534373834345C637573
746FF19403D04A80006D6572735C676F6F676C655C5032
31466C61677461696C6D63755C64656C69766572795C53
656E736F724875625F5032315C7372635C636870705C70
@@ -914,7 +914,7 @@ BD38B504464FF0827000F0B5FC144DA86078B90FF27004
0023002240F293210FF2380001B0BDE83040FBF732BB31
BD0000D088890025643A256409474E5353207365727669
636520616C7265616479206F70656E0A00000000633A5C
-77735C626F645F3437373631303738335F353432393431
+77735C626F645F3437373631313336315F353437383434
5C637573746F6D6572735C676F6F676C655C503231466C
61677461696C6D63755C64656C69766572795C53656E73
6F724875625F5032315C7372635C636870705C73657276
@@ -965,7 +965,7 @@ B6F9286060B13421ADF80410821D01A900913B46811D20
0023002295210FF23000FBF7EFF836B90023002296210F
F22000FBF7E7F83620FEF78EF9286030B1811D2046FFF7
99FF36203060012070BD633A5C77735C626F645F343737
-3631303738335F3534323934315C637573746F6D657273
+3631313336315F3534373834345C637573746F6D657273
5C676F6F676C655C503231466C61677461696C6D63755C
64656C69766572795C53656E736F724875625F5032315C
7372635C636870705C636F6D6D6F6E5C676E73735F63F1
@@ -1020,7 +1020,7 @@ B02016BD6272636D476E73734F6E4D6561734461746100
0025643A2564095B25735D204D6561737572656D656E74
2064617461206576656E74203A206D6561737572656D65
6E745F636F756E74203D20282564290A000000633A5C77
-735C626F645F3437373631303738335F3534323934315C
+735C626F645F3437373631313336315F3534373834345C
637573746F6D6572735C676F6F676C655C503231466C61
677461696C6D63755C64656C69766572795C53656E736F
724875625F5032315C7372635C636870705C706C617466
@@ -1229,9 +1229,9 @@ A288F2804343226C9A4214D291FBF0F111FB00F1A980F1
8891FBF0F111FB00F008E0B08838B1A88070BD00291CBF
F088002800D0A08070BD0B480170704700000948007870
4700000848017070470000064800787047000001484161
-70470000787B8900DD48080099CB91009ACB91002F2F64
+70470000787B8900045C080099CB91009ACB91002F2F64
65706F742F636C69656E742F636F72652F72656C2F476F
-6F676C652F5032322F3534303239362F2E2E2E0000007E
+6F676C652F5032322F3534353339302F2E2E2E0000007E
24247E5056542044756D70203A20474C4C207665722E20
256C7520666C61677461696C3A25730A000000007E2424
7E5056542044756D70203A2054203D20256C752C204E54
diff --git a/health/Health.cpp b/health/Health.cpp
index a50cc8bb..a81e731f 100644
--- a/health/Health.cpp
+++ b/health/Health.cpp
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -55,7 +54,6 @@ using aidl::android::hardware::health::charger::ChargerCallback;
using aidl::android::hardware::health::charger::ChargerModeMain;
using hardware::google::pixel::health::BatteryDefender;
using hardware::google::pixel::health::BatteryMetricsLogger;
-using hardware::google::pixel::health::BatteryThermalControl;
using hardware::google::pixel::health::DeviceHealth;
using hardware::google::pixel::health::LowBatteryShutdownMetrics;
using hardware::google::pixel::health::ChargerDetect;
@@ -70,8 +68,6 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"};
static BatteryDefender battDefender(WLC_DIR "/present",
"/sys/devices/platform/google,charger/charge_start_level",
"/sys/devices/platform/google,charger/charge_stop_level");
-static BatteryThermalControl battThermalControl(
- "/dev/thermal/tz-by-name/soc/mode");
static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV);
static LowBatteryShutdownMetrics shutdownMetrics(kVoltageAvg);
static DeviceHealth deviceHealth;
@@ -145,7 +141,6 @@ void private_healthd_board_init(struct healthd_config *hc) {
int private_healthd_board_battery_update(HealthInfo *health_info) {
deviceHealth.update(health_info);
- battThermalControl.updateThermalState(*health_info);
battMetricsLogger.logBatteryProperties(*health_info);
shutdownMetrics.logShutdownVoltage(*health_info);
// Allow BatteryDefender to override online properties
diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index 62b47070..31842ff8 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -154,6 +154,7 @@
+
@@ -168,6 +169,7 @@
+
@@ -182,6 +184,7 @@
+
@@ -195,6 +198,7 @@
+
@@ -209,6 +213,7 @@
+
@@ -223,6 +228,7 @@
+
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 22ad88e2..40c81ff1 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -15,6 +15,7 @@
-->
+
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index a41d0882..a1fe772b 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -53,7 +53,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
UFS_ERR_PATH(dme_err_count),
UFS_ERR_PATH(fatal_err_count),
UFS_ERR_PATH(auto_hibern8_err_count)
- }
+ },
+ .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
};
const struct UeventListener::UeventPaths ueventPaths = {