Snap for 9576141 from d094ba620f0fb5e2842c03ae2df1eee6664845f3 to udc-release

Change-Id: I1ce4536d73517f8f977bc5728760c485badc330d
This commit is contained in:
Android Build Coastguard Worker 2023-02-08 02:02:50 +00:00
commit d925691928
3 changed files with 20 additions and 13 deletions

View File

@ -21,3 +21,6 @@ allow battery_mitigation sysfs_bcl:lnk_file r_file_perms;
allow battery_mitigation sysfs_thermal:lnk_file r_file_perms;
allow battery_mitigation mitigation_vendor_data_file:dir rw_dir_perms;
allow battery_mitigation mitigation_vendor_data_file:file create_file_perms;
# Allow battery_mitigation to use Binder IPC so that service manager can notify it for callbacks
binder_use(battery_mitigation)

View File

@ -1,4 +1,6 @@
#vendor-metrics
genfscon sysfs /kernel/metrics/resume_latency/resume_latency_metrics u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/irq/long_irq_metrics u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/temp_residency/temp_residency_all/stats u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/thermal/tr_by_group/tmu/stats u:object_r:sysfs_vendor_metrics:s0
genfscon sysfs /kernel/metrics/thermal/tr_by_group/spmic/stats u:object_r:sysfs_vendor_metrics:s0

View File

@ -100,19 +100,21 @@ bool CpupmStateResidencyDataProvider::getStateResidencies(
stateId = temp;
}
if (stateId >= 0) {
entityIndex = matchEntity(line);
it = residencies->find(mConfig.entities[entityIndex].first);
if (stateId < 0) continue;
if (it != residencies->end()) {
if (parseState(line, &duration, &count)) {
it->second[stateId].totalTimeInStateMs = duration / US_TO_MS;
it->second[stateId].totalStateEntryCount = count;
} else {
LOG(ERROR) << "Failed to parse duration and count from [" << std::string(line)
<< "]";
return false;
}
entityIndex = matchEntity(line);
if (entityIndex < 0) continue;
it = residencies->find(mConfig.entities[entityIndex].first);
if (it != residencies->end()) {
if (parseState(line, &duration, &count)) {
it->second[stateId].totalTimeInStateMs = duration / US_TO_MS;
it->second[stateId].totalStateEntryCount = count;
} else {
LOG(ERROR) << "Failed to parse duration and count from [" << std::string(line)
<< "]";
return false;
}
}
}