Snap for 8500011 from d77490ac35 to udc-release

Change-Id: If4be1b49062f8d0d2be9726b340760e0e4e57d26
This commit is contained in:
Android Build Coastguard Worker 2022-04-26 03:16:51 +00:00
commit 2700bbff28
4 changed files with 5 additions and 17 deletions

View file

@ -538,6 +538,7 @@ on fs
restorecon_recursive /mnt/vendor/persist/audio restorecon_recursive /mnt/vendor/persist/audio
restorecon_recursive /mnt/vendor/persist/sensors restorecon_recursive /mnt/vendor/persist/sensors
restorecon_recursive /mnt/vendor/persist/battery restorecon_recursive /mnt/vendor/persist/battery
restorecon_recursive /mnt/vendor/persist/modem
# Set up display-related directories and permissions # Set up display-related directories and permissions
# Add restorecon_recursive command to make sure the restorecon label is persist_display_file. # Add restorecon_recursive command to make sure the restorecon label is persist_display_file.
restorecon_recursive /mnt/vendor/persist/display restorecon_recursive /mnt/vendor/persist/display
@ -899,9 +900,6 @@ on post-fs-data
mkdir /data/vendor/powerstats 0771 system system mkdir /data/vendor/powerstats 0771 system system
chown system system /data/vendor/powerstats chown system system /data/vendor/powerstats
on late-init && property:ro.boot.hw.soc.rev=0
setprop vendor.thermal.config "thermal_info_config_A0.json"
on property:vendor.thermal.link_ready=1 on property:vendor.thermal.link_ready=1
# BCL # BCL
write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c1 #DFS write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c1 #DFS

View file

@ -178,7 +178,7 @@ on charger
write /config/usb_gadget/g1/bcdDevice 0x0510 write /config/usb_gadget/g1/bcdDevice 0x0510
mkdir /config/usb_gadget/g1/functions/midi.gs5 mkdir /config/usb_gadget/g1/functions/midi.gs5
symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1 symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
setprop sys.usb.controller "11110000.dwc3" setprop sys.usb.controller "11210000.dwc3"
setprop sys.usb.configfs 1 setprop sys.usb.configfs 1
on property:ro.bootmode=charger on property:ro.bootmode=charger

View file

@ -6,13 +6,6 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="aidl" optional="true">
<name>android.hardware.biometrics.fingerprint</name>
<interface>
<name>IFingerprint</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl"> <hal format="aidl">
<name>android.hardware.contexthub</name> <name>android.hardware.contexthub</name>
<version>1</version> <version>1</version>

View file

@ -102,7 +102,6 @@ void addPlaceholderEnergyConsumers(std::shared_ptr<PowerStats> p) {
} }
void addAoC(std::shared_ptr<PowerStats> p) { void addAoC(std::shared_ptr<PowerStats> p) {
static const uint64_t TIMEOUT_MILLIS = 120;
std::string prefix = "/sys/devices/platform/19000000.aoc/control/"; std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
// Add AoC cores (a32, ff1, hf0, and hf1) // Add AoC cores (a32, ff1, hf0, and hf1)
@ -115,7 +114,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
std::vector<std::pair<std::string, std::string>> coreStates = { std::vector<std::pair<std::string, std::string>> coreStates = {
{"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}}; {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}};
p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds, p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds,
coreStates, TIMEOUT_MILLIS)); coreStates));
// Add AoC voltage stats // Add AoC voltage stats
std::vector<std::pair<std::string, std::string>> voltageIds = { std::vector<std::pair<std::string, std::string>> voltageIds = {
@ -126,8 +125,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
{"UUD", "ultra_underdrive"}, {"UUD", "ultra_underdrive"},
{"UD", "underdrive"}}; {"UD", "underdrive"}};
p->addStateResidencyDataProvider( p->addStateResidencyDataProvider(
std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates, std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates));
TIMEOUT_MILLIS));
// Add AoC monitor mode // Add AoC monitor mode
std::vector<std::pair<std::string, std::string>> monitorIds = { std::vector<std::pair<std::string, std::string>> monitorIds = {
@ -137,8 +135,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
{"MON", "mode"}, {"MON", "mode"},
}; };
p->addStateResidencyDataProvider( p->addStateResidencyDataProvider(
std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates, std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates));
TIMEOUT_MILLIS));
// Add AoC restart count // Add AoC restart count
const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {