Merge changes from topic "reapply_bm_condition" into 24D1-dev

* changes:
  bm: copy config file only for supported devices
  Reapply "bm: add mitigation config file for caimito"
This commit is contained in:
Sam Ou 2024-03-15 18:06:49 +00:00 committed by Android (Google) Code Review
commit cc8d3a0783
4 changed files with 64 additions and 0 deletions

View file

@ -0,0 +1,18 @@
{
"MitigationMethod":[
{
"Name":"AUDIO_MITIGATION",
"Module":"AUDIO",
"Trigger":["OILO1"],
"State":["LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
},
{
"Name":"UNDEFINED",
"Module":"UNDEFINED",
"Trigger":["OILO1", "OILO2", "UVLO1", "UVLO2", "SMPL"],
"State":["START", "LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
}
]
}

View file

@ -0,0 +1,18 @@
{
"MitigationMethod":[
{
"Name":"AUDIO_MITIGATION",
"Module":"AUDIO",
"Trigger":["OILO1"],
"State":["LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
},
{
"Name":"UNDEFINED",
"Module":"UNDEFINED",
"Trigger":["OILO1", "OILO2", "UVLO1", "UVLO2", "SMPL"],
"State":["START", "LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
}
]
}

View file

@ -0,0 +1,18 @@
{
"MitigationMethod":[
{
"Name":"AUDIO_MITIGATION",
"Module":"AUDIO",
"Trigger":["OILO1"],
"State":["LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
},
{
"Name":"UNDEFINED",
"Module":"UNDEFINED",
"Trigger":["OILO1", "OILO2", "UVLO1", "UVLO2", "SMPL"],
"State":["START", "LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
}
]
}

View file

@ -39,3 +39,13 @@ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-zuma.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-proto.json
# Battery Mitigation Config
ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay))
ifeq (,$(TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH))
TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH := device/google/caimito/battery_mitigation
endif
PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH)/bm_config_$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/bm_config.json
endif