From 43f80c6d449c35ec4273e20c86afe136d52f478b Mon Sep 17 00:00:00 2001
From: Shuvra Dutta <shuvro@google.com>
Date: Thu, 14 Mar 2024 06:16:13 +0000
Subject: [PATCH] Revert "bm: add mitigation config file for caimito"

Revert submission 26546990-bm_condition

Reason for revert: DroidMonitor-triggered revert due to breakage https://buganizer.corp.google.com/issues/329547607#comment6, bug b/329547607

Bug: 329547607

Reverted changes: /q/submissionid:26546990-bm_condition

Change-Id: Iaab4f61a44a0a02dfbaeff5c170ce033280a1674
---
 battery_mitigation/bm_config_caiman.json       | 18 ------------------
 battery_mitigation/bm_config_komodo.json       | 18 ------------------
 .../bm_config_ripcurrentpro.json               | 11 -----------
 battery_mitigation/bm_config_tokay.json        | 18 ------------------
 device-caimito-common.mk                       |  8 --------
 5 files changed, 73 deletions(-)
 delete mode 100644 battery_mitigation/bm_config_caiman.json
 delete mode 100644 battery_mitigation/bm_config_komodo.json
 delete mode 100644 battery_mitigation/bm_config_ripcurrentpro.json
 delete mode 100644 battery_mitigation/bm_config_tokay.json

diff --git a/battery_mitigation/bm_config_caiman.json b/battery_mitigation/bm_config_caiman.json
deleted file mode 100644
index 876f8f1f..00000000
--- a/battery_mitigation/bm_config_caiman.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "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"
-        }
-    ]
-}
diff --git a/battery_mitigation/bm_config_komodo.json b/battery_mitigation/bm_config_komodo.json
deleted file mode 100644
index 876f8f1f..00000000
--- a/battery_mitigation/bm_config_komodo.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "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"
-        }
-    ]
-}
diff --git a/battery_mitigation/bm_config_ripcurrentpro.json b/battery_mitigation/bm_config_ripcurrentpro.json
deleted file mode 100644
index 7848d87f..00000000
--- a/battery_mitigation/bm_config_ripcurrentpro.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "MitigationMethod":[
-        {
-            "Name":"UNDEFINED",
-            "Module":"UNDEFINED",
-            "Trigger":["OILO1", "OILO2", "UVLO1", "UVLO2", "SMPL"],
-            "State":["START", "LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
-            "Condition":"BASIC"
-        }
-    ]
-}
diff --git a/battery_mitigation/bm_config_tokay.json b/battery_mitigation/bm_config_tokay.json
deleted file mode 100644
index 876f8f1f..00000000
--- a/battery_mitigation/bm_config_tokay.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "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"
-        }
-    ]
-}
diff --git a/device-caimito-common.mk b/device-caimito-common.mk
index d5ade64d..2c13c015 100644
--- a/device-caimito-common.mk
+++ b/device-caimito-common.mk
@@ -39,11 +39,3 @@ 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
-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