Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 9019165 from 0f2a26aa3d to udc-release

Browse source 
Change-Id: I13e91145fd9e56086b0797c8b92a861e9678d923
This commit is contained in:
Android Build Coastguard Worker 2022-09-02 01:12:11 +00:00
commit 68ed1e5345
5 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
device.mk
View file

@ -588,7 +588,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
# Titan-M # Titan-M
ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include hardware/google/pixel/dauntless/dauntless.mk include device/google/gs-common/dauntless/gsc.mk
endif endif
# Copy Camera HFD Setfiles # Copy Camera HFD Setfiles

10
dumpstate/DumpstateDevice.cpp
View file

@ -266,7 +266,7 @@ DumpstateDevice::DumpstateDevice()
{ "aoc", [this](int fd) { dumpAoCSection(fd); } }, { "aoc", [this](int fd) { dumpAoCSection(fd); } },
{ "ramdump", [this](int fd) { dumpRamdumpSection(fd); } }, { "ramdump", [this](int fd) { dumpRamdumpSection(fd); } },
{ "misc", [this](int fd) { dumpMiscSection(fd); } }, { "misc", [this](int fd) { dumpMiscSection(fd); } },
{ "gsc", [this](int fd) { dumpGscSection(fd); } }, { "dump", [this](int fd) { dumpSection(fd); } },
{ "camera", [this](int fd) { dumpCameraSection(fd); } }, { "camera", [this](int fd) { dumpCameraSection(fd); } },
{ "trusty", [this](int fd) { dumpTrustySection(fd); } }, { "trusty", [this](int fd) { dumpTrustySection(fd); } },
{ "modem", [this](int fd) { dumpModemSection(fd); } }, { "modem", [this](int fd) { dumpModemSection(fd); } },
@ -1056,11 +1056,9 @@ void DumpstateDevice::dumpMiscSection(int fd) {
DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task"); DumpFileToFd(fd, "VENDOR PROC DUMP", "/proc/vendor_sched/dump_task");
} }
// Dump items related to GSC // Dump scripts under vendor/bin/dump
void DumpstateDevice::dumpGscSection(int fd) { void DumpstateDevice::dumpSection(int fd) {
RunCommandToFd(fd, "Citadel VERSION", {"vendor/bin/hw/citadel_updater", "-lv"}); RunCommandToFd(fd, "dump", {"/vendor/bin/dump/dump_gsc.sh"});
RunCommandToFd(fd, "Citadel STATS", {"vendor/bin/hw/citadel_updater", "--stats"});
RunCommandToFd(fd, "GSC DEBUG DUMP", {"vendor/bin/hw/citadel_updater", "-D"});
} }
// Dump essential camera debugging logs // Dump essential camera debugging logs

2
dumpstate/DumpstateDevice.h
View file

@ -76,7 +76,7 @@ struct DumpstateDevice : public IDumpstateDevice {
void dumpAoCSection(int fd); void dumpAoCSection(int fd);
void dumpRamdumpSection(int fd); void dumpRamdumpSection(int fd);
void dumpMiscSection(int fd); void dumpMiscSection(int fd);
void dumpGscSection(int fd); void dumpSection(int fd);
void dumpCameraSection(int fd); void dumpCameraSection(int fd);
void dumpTrustySection(int fd); void dumpTrustySection(int fd);
void dumpModemSection(int fd); void dumpModemSection(int fd);

5
health/Health.cpp
View file

@ -28,7 +28,6 @@
#include <health-impl/ChargerUtils.h> #include <health-impl/ChargerUtils.h>
#include <pixelhealth/BatteryDefender.h> #include <pixelhealth/BatteryDefender.h>
#include <pixelhealth/BatteryMetricsLogger.h> #include <pixelhealth/BatteryMetricsLogger.h>
#include <pixelhealth/BatteryThermalControl.h>
#include <pixelhealth/ChargerDetect.h> #include <pixelhealth/ChargerDetect.h>
#include <pixelhealth/DeviceHealth.h> #include <pixelhealth/DeviceHealth.h>
#include <pixelhealth/LowBatteryShutdownMetrics.h> #include <pixelhealth/LowBatteryShutdownMetrics.h>
@ -55,7 +54,6 @@ using aidl::android::hardware::health::charger::ChargerCallback;
using aidl::android::hardware::health::charger::ChargerModeMain; using aidl::android::hardware::health::charger::ChargerModeMain;
using hardware::google::pixel::health::BatteryDefender; using hardware::google::pixel::health::BatteryDefender;
using hardware::google::pixel::health::BatteryMetricsLogger; using hardware::google::pixel::health::BatteryMetricsLogger;
using hardware::google::pixel::health::BatteryThermalControl;
using hardware::google::pixel::health::DeviceHealth; using hardware::google::pixel::health::DeviceHealth;
using hardware::google::pixel::health::LowBatteryShutdownMetrics; using hardware::google::pixel::health::LowBatteryShutdownMetrics;
using hardware::google::pixel::health::ChargerDetect; using hardware::google::pixel::health::ChargerDetect;
@ -70,8 +68,6 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"};
static BatteryDefender battDefender(WLC_DIR "/present", static BatteryDefender battDefender(WLC_DIR "/present",
"/sys/devices/platform/google,charger/charge_start_level", "/sys/devices/platform/google,charger/charge_start_level",
"/sys/devices/platform/google,charger/charge_stop_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 BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV);
static LowBatteryShutdownMetrics shutdownMetrics(kVoltageAvg); static LowBatteryShutdownMetrics shutdownMetrics(kVoltageAvg);
static DeviceHealth deviceHealth; 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) { int private_healthd_board_battery_update(HealthInfo *health_info) {
deviceHealth.update(health_info); deviceHealth.update(health_info);
battThermalControl.updateThermalState(*health_info);
battMetricsLogger.logBatteryProperties(*health_info); battMetricsLogger.logBatteryProperties(*health_info);
shutdownMetrics.logShutdownVoltage(*health_info); shutdownMetrics.logShutdownVoltage(*health_info);
// Allow BatteryDefender to override online properties // Allow BatteryDefender to override online properties

2
uwb/uwb.mk
View file

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# UWB - ultra wide band # UWB - ultra wide band
$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk)
LOCAL_UWB_CAL_DIR=device/google/gs101/uwb/calibration LOCAL_UWB_CAL_DIR=device/google/gs101/uwb/calibration