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

Snap for 11373247 from 9f8d681088 to 24Q2-release

Browse source 
Change-Id: I436fc853c2a4d18538b8c32da9de8e10a1aed1b7
This commit is contained in:
Android Build Coastguard Worker 2024-01-30 02:02:39 +00:00
commit d74a44c99f
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BoardConfig-common.mk
View file

@ -348,6 +348,14 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
# Since Pixel 6/6pro doesn't have a system_dlkm partition, the GKI modules are
# on the vendor_dlkm partition. In order to allow them to load properly, we
# need to retain the module signature which would normally get stripped during
# packaging. Disable stripping the vendor_dlkm modules to retain the GKI
# modules' signature. Note, the pixel kernel builds always strip the modules in
# favor of saving space via the kleaf property: strip_modules = True.
BOARD_DO_NOT_STRIP_VENDOR_MODULES := true
# Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load # Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load
BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140/fips140.ko BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140/fips140.ko
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))

8
device_framework_matrix_product.xml
View file

@ -142,14 +142,6 @@
<instance>sced0</instance> <instance>sced0</instance>
</interface> </interface>
</hal> </hal>
<hal format="aidl" optional="true">
<name>com.google.pixel.modem.logmasklibrary</name>
<version>1</version>
<interface>
<name>ILiboemserviceProxy</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true"> <hal format="hidl" optional="true">
<name>vendor.samsung_slsi.telephony.hardware.radioExternal</name> <name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
<version>1.1</version> <version>1.1</version>

7
powerstats/Gs101CommonDataProviders.cpp
View file

@ -18,6 +18,7 @@
#include <Gs101CommonDataProviders.h> #include <Gs101CommonDataProviders.h>
#include "AocStateResidencyDataProvider.h" #include "AocStateResidencyDataProvider.h"
#include "DevfreqStateResidencyDataProvider.h" #include "DevfreqStateResidencyDataProvider.h"
#include <DisplayMrrStateResidencyDataProvider.h>
#include "DvfsStateResidencyDataProvider.h" #include "DvfsStateResidencyDataProvider.h"
#include "UfsStateResidencyDataProvider.h" #include "UfsStateResidencyDataProvider.h"
#include <dataproviders/GenericStateResidencyDataProvider.h> #include <dataproviders/GenericStateResidencyDataProvider.h>
@ -34,6 +35,7 @@
using aidl::android::hardware::power::stats::AocStateResidencyDataProvider; using aidl::android::hardware::power::stats::AocStateResidencyDataProvider;
using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider; using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
using aidl::android::hardware::power::stats::DisplayMrrStateResidencyDataProvider;
using aidl::android::hardware::power::stats::DvfsStateResidencyDataProvider; using aidl::android::hardware::power::stats::DvfsStateResidencyDataProvider;
using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider; using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider;
using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::EnergyConsumerType;
@ -669,6 +671,11 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
p->addStateResidencyDataProvider(std::move(pixelSdp)); p->addStateResidencyDataProvider(std::move(pixelSdp));
} }
void addDisplayMrr(std::shared_ptr<PowerStats> p) {
p->addStateResidencyDataProvider(std::make_unique<DisplayMrrStateResidencyDataProvider>(
"Display", "/sys/class/drm/card0/device/primary-panel/"));
}
void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p) { void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p) {
setEnergyMeter(p); setEnergyMeter(p);

1
powerstats/include/Gs101CommonDataProviders.h
View file

@ -22,4 +22,5 @@ using aidl::android::hardware::power::stats::PowerStats;
void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p); void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p);
void addDisplayMrr(std::shared_ptr<PowerStats> p);
void addNFC(std::shared_ptr<PowerStats> p, const std::string& path); void addNFC(std::shared_ptr<PowerStats> p, const std::string& path);