fogos: Bump power dep to V6

Change-Id: I3b96c12457d8833ac3a9ff4558f9e2553571d9a9

Android.mk

@@ -1,11 +0,0 @@
-#
-# Copyright (C) 2022-2023 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_DEVICE),fogos)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif

BoardConfig.mk

@@ -35,7 +35,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
 
 # Security patch level
-VENDOR_SECURITY_PATCH := 2024-07-01
+VENDOR_SECURITY_PATCH := 2024-11-01
 
 # inherit from the proprietary version
 include vendor/motorola/fogos/BoardConfigVendor.mk

configs/thermal-engine-fogos-game-perf.conf

@@ -0,0 +1,186 @@
+#current 4  3.5  3  2.5  2  1.5  1.2  0.9  0.6
+#        9   8   7   6   5   4    3     2    1
+
+#CPU0 frequency 300000 576000 691200 940800 1113600 1324800 1516800 1651200 1708800 1804800
+#CPU6 frequency 691200 940800 1228800 1401600 1516800 1651200 1804800 1900800 2054400 2208000
+
+[FRONT_TEMP]
+algo_type        virtual
+trip_sensor      xo_therm
+thresholds       -18000
+thresholds_clr   -20000
+sensors          msm_therm quiet_therm battery
+weights          26 25 49
+offsets          0
+sampling         1000
+math             0
+sys_temp
+
+[REPORT-FRONT-TEMP]
+algo_type        monitor
+sampling         300000
+sensor           FRONT_TEMP
+thresholds       45000
+thresholds_clr   43000
+actions          report
+action_info      1
+
+[BACK_TEMP]
+algo_type        virtual
+trip_sensor      xo_therm
+thresholds       -18000
+thresholds_clr   -20000
+sensors          msm_therm quiet_therm battery
+weights          40 23 37
+offsets          0
+sampling         1000
+math             0
+sys_temp
+
+[REPORT-BACK-TEMP]
+algo_type        monitor
+sampling         300000
+sensor           BACK_TEMP
+thresholds       45000
+thresholds_clr   43000
+actions          report
+action_info      1
+
+[DETECT-STANDBY]
+algo_type        virtual
+trip_sensor      quiet_therm
+thresholds       -18000
+thersholds_clr   -20000
+sensors          lcd_brightness_value
+weights 50
+sampling 1000
+less_than
+math 7
+
+[OVERRIDE-CHG]
+algo_type        monitor
+sampling         1000
+sensor           DETECT-STANDBY
+thresholds       1
+thresholds_clr   0
+actions          internal_override
+action_info      1
+
+[FREEZE-CHG]
+algo_type        monitor
+sampling         1000
+descending
+sensor           DETECT-STANDBY
+thresholds       0
+thresholds_clr   1
+actions          freeze_rule
+action_info      1
+
+[Virt-MSM]
+algo_type        virtual
+sensors          msm_therm
+weights          100
+trip_sensor      chg_therm
+thresholds       18000
+thresholds_clr   16000
+offsets          0
+sampling         1000
+math             0
+
+[Virt-CHG]
+algo_type        virtual
+sensors          chg_therm
+weights          100
+trip_sensor      msm_therm
+thresholds       18000
+thresholds_clr   16000
+offsets          0
+sampling         1000
+math             0
+
+[Virt-QUT]
+algo_type        virtual
+sensors          quiet_therm
+weights          100
+trip_sensor      xo_therm
+thresholds       18000
+thresholds_clr   16000
+offsets          0
+sampling         1000
+math             0
+
+[MON-MSM-STB]
+algo_type        monitor
+sampling         1000
+sensor           Virt-QUT
+thresholds       36000 38000 39500 41000 42000 45000
+thresholds_clr   35000 37000 39000 39500 41500 43000
+actions          battery battery battery battery battery battery
+action_info      8 7 6 5 4 3
+freezing
+
+[MON-CHG-NORMAL]
+algo_type          monitor
+sampling           1000
+sensor             Virt-QUT
+thresholds         35000 37000 39000
+thresholds_clr     33000 35000 37000
+actions            battery battery battery
+action_info        5 3 1
+override_c       10000
+
+[MON-MSM-CPU0]
+algo_type        monitor
+sampling         1000
+sensor           BACK_TEMP
+thresholds       46000 48000 49500
+thresholds_clr   45000 46000 48000
+actions          cpu0 cpu0 cpu0
+action_info      1651200 1516800 1113600
+override_b       4000
+
+[MON-MSM-CPU6]
+algo_type        monitor
+sampling         1000
+sensor           BACK_TEMP
+thresholds       46000 48000 49500
+thresholds_clr   44000 46000 48000
+actions          cpu6 cpu6 cpu6
+action_info      1900800 1804800 1401600
+override_b       4000
+
+[MONITOR-CAMERA-MSM]
+algo_type        monitor
+sampling         1000
+sensor           Virt-QUT
+thresholds       55000 60000
+thresholds_clr   53000 55000
+actions          camera camera
+action_info      1 2
+
+[MON-MODEM]
+algo_type          monitor
+sampling           1000
+sensor             Virt-MSM
+thresholds         80000 85000
+thresholds_clr     78000 80000
+actions            modem_skin modem_skin
+action_info        1 2
+
+[MODEM-PA-FR]
+algo_type          monitor
+sampling           5000
+sensor             xo_therm
+thresholds         65000 70000
+thresholds_clr     60000 65000
+actions            modem_pa_fr1 modem_pa_fr1
+action_info        1 2
+
+[LCD-MONITOR]
+algo_type          monitor
+sampling           1000
+sensor             Virt-QUT
+thresholds          45000 46000 48000
+thresholds_clr      43000 45000 46000
+actions             panel0-backlight panel0-backlight panel0-backlight
+action_info          1 300 500

device.mk

@@ -96,8 +96,14 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
 
+# Thermal
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/thermal-engine-fogos-game-perf.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-fogos.conf
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
 
+$(call soong_config_set,power_libperfmgr,mode_extension_lib,//$(LOCAL_PATH):libperfmgr-ext-fogos)
+
 # Inherit from vendor blobs
 $(call inherit-product, vendor/motorola/fogos/fogos-vendor.mk)

extract-files.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+from extract_utils.fixups_lib import (
+    lib_fixups,
+    lib_fixups_user_type,
+)
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+
+namespace_imports = [
+    'vendor/motorola/sm6375-common',
+    'device/motorola/sm6375-common',
+    'hardware/qcom-caf/common/libqti-perfd-client',
+    'hardware/qcom-caf/sm8350',
+    'hardware/qcom-caf/wlan',
+    'hardware/motorola',
+    'vendor/qcom/opensource/commonsys/display',
+    'vendor/qcom/opensource/commonsys-intf/display',
+    'vendor/qcom/opensource/dataservices',
+    'vendor/qcom/opensource/display',
+]
+
+lib_fixups: lib_fixups_user_type = {
+    **lib_fixups,
+}
+
+blob_fixups: blob_fixups_user_type = {
+    ('vendor/lib/libmot_chi_desktop_helper.so', 'vendor/lib64/libmot_chi_desktop_helper.so'): blob_fixup()
+        .add_needed('libgui_shim_vendor.so'),
+    'vendor/lib64/sensors.moto.so': blob_fixup()
+         .add_needed('libbase_shim.so'),
+}  # fmt: skip
+
+module = ExtractUtilsModule(
+    'fogos',
+    'motorola',
+    namespace_imports=namespace_imports,
+    blob_fixups=blob_fixups,
+    lib_fixups=lib_fixups,
+    add_firmware_proprietary_file=False,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device_with_common(
+        module, 'sm6375-common', module.vendor
+    )
+    utils.run()

extract-files.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-function blob_fixup() {
-    case "${1}" in
-        vendor/lib/libmot_chi_desktop_helper.so | vendor/lib64/libmot_chi_desktop_helper.so)
-            [ "$2" = "" ] && return 0
-            grep -q "libgui_shim_vendor.so" "${2}" || "${PATCHELF}" --add-needed "libgui_shim_vendor.so" "${2}"
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-    return 0
-}
-function blob_fixup_dry() {
-    blob_fixup "$1" ""
-}
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-
-set -e
-
-export DEVICE=fogos
-export DEVICE_COMMON=sm6375-common
-export VENDOR=motorola
-export VENDOR_COMMON=${VENDOR}
-
-"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/extract-files.sh" "$@"

lineage_fogos.mk

@@ -6,6 +6,7 @@
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+TARGET_SUPPORTS_OMX_SERVICE := false
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit from fogos device
@@ -23,7 +24,6 @@ PRODUCT_MODEL := moto g34 5G
 PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    TARGET_PRODUCT=fogos_g \
+    BuildDesc="fogos_g-user 14 U1UGS34M.23-82-2-6 0b9749 release-keys" \
-    PRIVATE_BUILD_DESC="fogos_g-user 14 U1UGS34M.23-82-2-3 da6528 release-keys"
+    BuildFingerprint=motorola/fogos_g/fogos:11/U1UGS34.23-82-2-6/e21904:user/release-keys \
-
+    DeviceProduct=fogos_g
-BUILD_FINGERPRINT := motorola/fogos_g/fogos:11/U1UGS34.23-82-2-3/653ba:user/release-keys

power/Android.bp

@@ -0,0 +1,11 @@
+cc_library_static {
+    name: "libperfmgr-ext-fogos",
+    vendor: true,
+    srcs: [
+        "power-mode.cpp",
+    ],
+    shared_libs: [
+        "android.hardware.power-V6-ndk",
+        "libbase",
+    ],
+}

power/power-mode.cpp

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 The LineageOS Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <aidl/android/hardware/power/BnPower.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <sys/ioctl.h>
+
+namespace aidl {
+namespace google {
+namespace hardware {
+namespace power {
+namespace impl {
+namespace pixel {
+
+using ::aidl::android::hardware::power::Mode;
+
+const std::string TAP_TO_WAKE_NODE = "/sys/class/touchscreen/primary/gesture";
+
+bool isDeviceSpecificModeSupported(Mode type, bool* _aidl_return) {
+    switch (type) {
+        case Mode::DOUBLE_TAP_TO_WAKE:
+            *_aidl_return = true;
+            return true;
+        default:
+            return false;
+    }
+}
+
+bool setDeviceSpecificMode(Mode type, bool enabled) {
+    switch (type) {
+        case Mode::DOUBLE_TAP_TO_WAKE: {
+            ::android::base::WriteStringToFile(enabled ? "1" : "0", TAP_TO_WAKE_NODE, true);
+            return true;
+        }
+        default:
+            return false;
+    }
+}
+
+}  // namespace pixel
+}  // namespace impl
+}  // namespace power
+}  // namespace hardware
+}  // namespace google
+}  // namespace aidl

proprietary-files.txt

@@ -1,4 +1,4 @@
-# All unpinned blobs are extracted from fogos_g-user 14 U1UGS34M.23-82-2-3 da6528 release-keys
+# All unpinned blobs are extracted from fogos_g-user 14 U1UGS34.23-82-2-6 e21904 release-keys
 
 # ACDB-data
 vendor/etc/acdbdata/nn_ns_models/candidate__2.7.1.31__3.0.0__eai_1.10_enpu1.pmd
@@ -31,12 +31,8 @@ vendor/etc/bstconfig/hdrcfg.cfg
 vendor/etc/pwr/PowerFeatureConfig.xml
 vendor/etc/pwr/VideoPowerOptFeature.xml
 vendor/lib/libcamxexternalformatutils.so
-vendor/lib64/libC2D2.so
 vendor/lib64/libc2d_helper.so
-vendor/lib/libbitmlengine.so
-vendor/lib/libbitmlenginev2.so
 vendor/lib64/libhdr_impl.so
-vendor/lib/libcamxexternalformatutils.so
 vendor/lib64/camera/fdconfigpreview.bin
 vendor/lib64/camera/fdconfigpreviewlite.bin
 vendor/lib64/camera/fdconfigvideo.bin
@@ -95,7 +91,6 @@ vendor/lib64/libmmcamera_mfnr.so
 vendor/lib64/libmmcamera_mfnr_t4.so
 vendor/lib64/libmmcamera_pdpc.so
 vendor/lib64/libmot_afd.so
-vendor/lib64/libmotohid.so
 vendor/lib64/libmpbase.so
 vendor/lib64/libofflinedump.so
 vendor/lib64/libofflinelog.so
@@ -112,14 +107,12 @@ vendor/lib64/libtfestriping.so
 vendor/lib64/libthreadutils.so
 vendor/lib64/libvidhance.so
 vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
-vendor/lib64/vendor.qti.hardware.scve.objecttracker@1.0.so
-vendor/lib64/vendor.qti.hardware.scve.panorama@1.0.so
 
 # Camera - Motorola
 vendor/etc/init/motorola.hardware.camera.imgtuner@2.0-service.rc
-vendor/lib64/hw/motorola.hardware.camera.imgtuner@2.0-impl.so
+vendor/lib64/hw/motorola.hardware.camera.imgtuner@2.0-impl.so;DISABLE_CHECKELF
-vendor/lib64/motorola.hardware.camera.imgtuner@1.0.so
+vendor/lib64/motorola.hardware.camera.imgtuner@1.0.so;DISABLE_CHECKELF
-vendor/lib64/motorola.hardware.camera.imgtuner@2.0.so
+vendor/lib64/motorola.hardware.camera.imgtuner@2.0.so;DISABLE_CHECKELF
 vendor/lib64/motorola.hardware.camera.desktop@1.0.so
 vendor/lib64/motorola.hardware.camera.desktop@2.0.so
 
@@ -273,8 +266,8 @@ vendor/firmware/sec_s3nrn4v_firmware.bin
 vendor/firmware/tm_goodix_cfg_group.bin
 
 # HotwordEnrollment
--product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk
+product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk
--product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk
+product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar
 
@@ -447,8 +440,4 @@ vendor/etc/sensors/proto/tcs3708.proto
 vendor/etc/sensors/sns_reg_config
 
 # Thermal configs
-vendor/etc/thermal-engine-fogos-camera.conf
-vendor/etc/thermal-engine-fogos-game-normal.conf
-vendor/etc/thermal-engine-fogos-game-perf.conf
-vendor/etc/thermal-engine-fogos.conf
 vendor/etc/thermal-engine.conf

resource-overlay/Android.mk

@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)

resource-overlay/fogos/Frameworks/res/values/config.xml

@@ -348,4 +348,7 @@
 
     <!-- Whether the device enable the non-standalone (NSA) mode of 5G NR.-->
     <bool name="config_telephony5gNonStandalone">true</bool>
+
+    <!-- Whether device supports double tap to wake -->
+    <bool name="config_supportDoubleTapWake">true</bool>
 </resources>

resource-overlay/fogos/Frameworks/res/xml/power_profile.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
 <device name="Android">
     <item name="none">0</item>
-    <item name="screen.on">120.12</item>
+    <item name="screen.on.display0">120.12</item>
-    <item name="screen.full">370.48</item>
+    <item name="screen.full.display0">370.48</item>
     <item name="wifi.on">1.78</item>
     <item name="wifi.active">110.2</item>
     <item name="wifi.scan">83.35</item>
@@ -36,6 +40,8 @@
         <value>1651200</value>
         <value>1708800</value>
         <value>1804800</value>
+        <value>1900800</value>
+        <value>2016000</value>
     </array>
     <array name="cpu.core_speeds.cluster1">
         <value>691200</value>
@@ -48,6 +54,7 @@
         <value>1900800</value>
         <value>2054400</value>
         <value>2208000</value>
+        <value>2304000</value>
     </array>
     <array name="cpu.core_power.cluster0">
         <value>22.8</value>
@@ -59,7 +66,9 @@
         <value>43.8</value>
         <value>52.3</value>
         <value>53.7</value>
-        <value>57.2</value>
+        <value>54.2</value>
+        <value>57.7</value>
+        <value>59.7</value>
     </array>
     <array name="cpu.core_power.cluster1">
         <value>53.3</value>
@@ -68,10 +77,11 @@
         <value>114.4</value>
         <value>130.6</value>
         <value>155.6</value>
-        <value>173.7</value>
+        <value>181.7</value>
-        <value>184.6</value>
+        <value>197.6</value>
-        <value>197.3</value>
+        <value>204.4</value>
-        <value>220.5</value>
+        <value>230.9</value>
+        <value>253.1</value>
     </array>
     <item name="cpu.cluster_power.cluster0">13.5</item>
     <item name="cpu.cluster_power.cluster1">43.3</item>

rootdir/etc/init/hw/init.mmi.overlay.rc

@@ -77,9 +77,6 @@ on boot
     chown root input /sys/class/sensors/Moto\ CapSense\ Ch3/poll_delay
     chown root input /sys/class/sensors/Moto\ CapSense\ Ch4/enable
     chown root input /sys/class/sensors/Moto\ CapSense\ Ch4/poll_delay
-    # Change ownership for touch gesture
-    chown root input /sys/class/sensors/dt-gesture/enable
-    chown root input /sys/class/sensors/dt-gesture/poll_delay
     # touch
     chown system system /sys/class/touchscreen/primary/interpolation
     chmod 0660 /sys/class/touchscreen/primary/interpolation

setup-makefiles.py

@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles

setup-makefiles.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-
-set -e
-
-export DEVICE=fogos
-export DEVICE_COMMON=sm6375-common
-export VENDOR=motorola
-export VENDOR_COMMON=${VENDOR}
-
-"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"

update-sha1sums.py

@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020 The LineageOS 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.
-#
-
-import os
-import sys
-from hashlib import sha1
-
-device='fogos'
-vendor='motorola'
-
-with open('proprietary-files.txt', 'r') as f:
-    lines = f.read().splitlines()
-vendorPath = '../../../vendor/' + vendor + '/' + device + '/proprietary'
-needSHA1 = False
-
-
-def cleanup():
-    for index, line in enumerate(lines):
-        # Skip empty or commented lines
-        if len(line) == 0 or line[0] == '#' or '|' not in line:
-            continue
-
-        # Drop SHA1 hash, if existing
-        lines[index] = line.split('|')[0]
-
-
-def update():
-    for index, line in enumerate(lines):
-        # Skip empty lines
-        if len(line) == 0:
-            continue
-
-        # Check if we need to set SHA1 hash for the next files
-        if line[0] == '#':
-            needSHA1 = (' - from' in line)
-            continue
-
-        if needSHA1:
-            # Remove existing SHA1 hash
-            line = line.split('|')[0]
-
-            filePath = line.split(';')[0].split(':')[-1]
-            if filePath[0] == '-':
-                filePath = filePath[1:]
-
-            with open(os.path.join(vendorPath, filePath), 'rb') as f:
-                hash = sha1(f.read()).hexdigest()
-
-            lines[index] = '%s|%s' % (line, hash)
-
-
-if len(sys.argv) == 2 and sys.argv[1] == '-c':
-    cleanup()
-else:
-    update()
-
-with open('proprietary-files.txt', 'w') as file:
-    file.write('\n'.join(lines) + '\n')