Snap for 8656595 from 9664423244 to tm-qpr1-release

Change-Id: I6d55313082cc7f20cfae6f98ea543dec878ea970

battery_mitigation/Android.bp

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package {
+    default_applicable_licenses: [
+        "//device/google/gs201:device_google_gs201_license",
+    ],
+}
+
+cc_binary {
+    name: "battery_mitigation",
+    relative_install_path: "hw",
+    proprietary: true,
+    init_rc: ["battery_mitigation.rc"],
+    shared_libs: [
+        "libpixelmitigation",
+        "libbase",
+        "libbinder_ndk",
+        "libcutils",
+        "libhardware",
+        "libhidlbase",
+        "liblog",
+        "libutils",
+        "android.hardware.thermal@2.0"
+    ],
+    srcs: [
+        "battery_mitigation.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+}

battery_mitigation/battery_mitigation.cpp

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "battery-mitigation"
+
+#include <battery_mitigation/BatteryMitigation.h>
+
+using android::hardware::google::pixel::BatteryMitigation;
+using android::hardware::google::pixel::MitigationConfig;
+
+android::sp<BatteryMitigation> bmSp;
+
+const struct MitigationConfig::Config cfg = {
+    .SystemPath = {
+        "/dev/thermal/tz-by-name/batoilo/temp",
+        "/dev/thermal/tz-by-name/smpl_gm/temp",
+        "/dev/thermal/tz-by-name/soc/temp",
+        "/dev/thermal/tz-by-name/vdroop1/temp",
+        "/dev/thermal/tz-by-name/vdroop2/temp",
+        "/dev/thermal/tz-by-name/ocp_gpu/temp",
+        "/dev/thermal/tz-by-name/ocp_tpu/temp",
+        "/dev/thermal/tz-by-name/soft_ocp_cpu2/temp",
+        "/dev/thermal/tz-by-name/soft_ocp_cpu1/temp",
+        "/dev/thermal/tz-by-name/battery/temp",
+        "/dev/thermal/tz-by-name/battery_cycle/temp",
+        "/sys/bus/iio/devices/iio:device0/lpf_power",
+        "/sys/bus/iio/devices/iio:device1/lpf_power",
+        "/sys/class/power_supply/battery/voltage_now",
+        "/sys/class/power_supply/battery/current_now",
+    },
+    .FilteredZones = {
+        "batoilo",
+        "vdroop1",
+        "vdroop2",
+        "smpl_gm",
+    },
+    .SystemName = {
+        "batoilo", "smpl_gm", "soc", "vdroop1", "vdroop2", "ocp_gpu",
+        "ocp_tpu", "soft_ocp_cpu2", "soft_ocp_cpu1", "battery", "battery_cycle",
+        "main", "sub", "voltage_now", "current_now",
+    },
+    .LogFilePath = "/data/vendor/mitigation/lastmeal.txt",
+};
+
+int main(int /*argc*/, char ** /*argv*/) {
+    bmSp = new BatteryMitigation(cfg);
+    while (true) {
+        pause();
+    }
+    return 0;
+}

battery_mitigation/battery_mitigation.rc

@@ -0,0 +1,9 @@
+on property:vendor.thermal.link_ready=1
+    mkdir /data/vendor/mitigation 0755 system system
+    chown system system /data/vendor/mitigation
+    start vendor.battery_mitigation
+
+service vendor.battery_mitigation /vendor/bin/hw/battery_mitigation
+    user system
+    group system
+    capabilities WAKE_ALARM BLOCK_SUSPEND

device.mk

@@ -542,6 +542,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
         ConnectivityOverlay
 
+# Battery Mitigation
+PRODUCT_PACKAGES += \
+        battery_mitigation
+
 PRODUCT_PACKAGES_DEBUG += \
 	sg_write_buffer \
 	f2fs_io \
@@ -560,7 +564,9 @@ PRODUCT_PACKAGES += \
 # Enable project quotas and casefolding for emulated storage without sdcardfs
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/android_t_baseline.mk)
+PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD := gz
+
 # Enforce generic ramdisk allow list
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 

dumpstate/Dumpstate.cpp

@@ -453,6 +453,7 @@ void Dumpstate::dumpPowerSection(int fd) {
     if (!PropertiesHelper::IsUserBuild()) {
         RunCommandToFd(fd, "gvotables", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/gvotables/*/status"});
     }
+    DumpFileToFd(fd, "Lastmeal", "/data/vendor/mitigation/lastmeal.txt");
     RunCommandToFd(fd, "Mitigation Stats", {"/vendor/bin/sh", "-c", "echo \"Source\\t\\tCount\\tSOC\\tTime\\tVoltage\"; "
                         "for f in `ls /sys/devices/virtual/pmic/mitigation/last_triggered_count/*` ; "
                         "do count=`cat $f`; "