Snap for 11078623 from f382fb25df1c6ec58f5a1195e12da2442725d495 to 24Q1-release

Change-Id: Ie9b3df5de678d0d7afc249fd8514ff082edf1e10
This commit is contained in:
Android Build Coastguard Worker 2023-11-10 00:02:04 +00:00
commit 6bac540c02
2 changed files with 17 additions and 1 deletions

View File

@ -91,6 +91,7 @@ const struct MitigationConfig::EventThreadConfig eventThreadCfg = {
.StoringPath = "/data/vendor/mitigation/thismeal.bin",
.ParsedThismealPath = "/data/vendor/mitigation/thismeal.txt",
.ParsedLastmealPath = "/data/vendor/mitigation/lastmeal.txt",
.ParsedLastmealCSVPath = "/data/vendor/mitigation/lastmeal.csv",
.FvpStatsPath = "/sys/devices/platform/acpm_stats/fvp_stats",
.PmicCommon = {
/* Main Pmic */
@ -183,7 +184,8 @@ int main(int argc, char **argv) {
mitigationLogTimeValid = batteryMitigationService->isTimeValid(eventThreadCfg.StoringPath,
batteryMitigationStartTime);
if (!reason.empty() && mitigationLogTimeValid &&
batteryMitigationService->genParsedMeal(eventThreadCfg.ParsedLastmealPath)) {
batteryMitigationService->genParsedMeal(eventThreadCfg.ParsedLastmealPath) &&
batteryMitigationService->genLastmealCSV(eventThreadCfg.ParsedLastmealCSVPath)) {
android::base::SetProperty(kLastMealProperty, "1");
}
/* Start BrownoutEventThread to poll brownout event from kernel */

View File

@ -0,0 +1,14 @@
# Allow the audio hal to access the EdgeTPU service and the
# Android shared memory allocated by the EdgeTPU service for
# on-device compilation.
allow hal_audio_default edgetpu_device:chr_file rw_file_perms;
allow hal_audio_default edgetpu_vendor_service:service_manager find;
binder_call(hal_audio_default, edgetpu_vendor_server)
# Allow edgetpu_app_service as well, due to the EdgeTpu metrics logging
# library has a dependency on edgetpu_app_service, see b/275016466.
allow hal_audio_default edgetpu_app_service:service_manager find;
binder_call(hal_audio_default, edgetpu_app_server)
# Allow audio HAL to read tflite Darwinn delegate properties
get_prop(hal_audio_default, vendor_tflite_delegate_prop)