mondrian: Switch powershare HAL to lineage default

BoardConfig.mk

@@ -233,7 +233,7 @@ BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE := true
 ENABLE_VENDOR_RIL_SERVICE := true
 
 # Security patch level
-VENDOR_SECURITY_PATCH := 2025-03-01
+VENDOR_SECURITY_PATCH := 2025-05-06
 
 # Sensor
 SOONG_CONFIG_NAMESPACES += SENSORS_XIAOMI

device.mk

@@ -320,9 +320,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     vendor/qcom/opensource/power/config/taro/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml
 
-# PowerShare
-PRODUCT_PACKAGES += \
-    vendor.lineage.powershare@1.0-service.xiaomi_mondrian
+# Powershare
+$(call soong_config_set,lineage_powershare,powershare_path,/sys/class/qcom-battery/reverse_chg_mode)
 
 # Protobuf
 PRODUCT_PACKAGES += \

lineage_mondrian.mk

@@ -21,8 +21,8 @@ PRODUCT_SYSTEM_DEVICE := mondrian
 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="mondrian_global-user 12 SKQ1.230401.001 OS2.0.7.0.VMNMIXM release-keys" \
-    BuildFingerprint=POCO/mondrian_global/mondrian:12/SKQ1.230401.001/OS2.0.7.0.VMNMIXM:user/release-keys \
+    BuildDesc="mondrian_global-user 12 SKQ1.230401.001 OS2.0.9.0.VMNMIXM release-keys" \
+    BuildFingerprint=POCO/mondrian_global/mondrian:12/SKQ1.230401.001/OS2.0.9.0.VMNMIXM:user/release-keys \
     DeviceProduct=$(PRODUCT_DEVICE)
 
 TARGET_BOOT_ANIMATION_RES := 1440

powershare/Android.bp

@@ -1,32 +0,0 @@
-//
-// Copyright (C) 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.
-
-cc_binary {
-    relative_install_path: "hw",
-    defaults: ["hidl_defaults"],
-    name: "vendor.lineage.powershare@1.0-service.xiaomi_mondrian",
-    init_rc: ["vendor.lineage.powershare@1.0-service.xiaomi_mondrian.rc"],
-    vintf_fragments: ["vendor.lineage.powershare@1.0-service.xiaomi_mondrian.xml"],
-    srcs: ["service.cpp", "PowerShare.cpp"],
-    shared_libs: [
-        "libbase",
-        "libhardware",
-        "libhidlbase",
-        "liblog",
-        "libutils",
-        "vendor.lineage.powershare@1.0",
-    ],
-    proprietary: true,
-}

powershare/PowerShare.cpp

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-#define LOG_TAG "PowerShareService"
-
-#include "PowerShare.h"
-#include <hidl/HidlTransportSupport.h>
-#include <fstream>
-
-namespace vendor {
-namespace lineage {
-namespace powershare {
-namespace V1_0 {
-namespace implementation {
-
-#define WIRELESS_TX_ENABLE_PATH "/sys/class/qcom-battery/reverse_chg_mode"
-
-/*
- * Write value to path and close file.
- */
-template <typename T>
-static void set(const std::string& path, const T& value) {
-    std::ofstream file(path);
-    file << value;
-}
-
-template <typename T>
-static T get(const std::string& path, const T& def) {
-    std::ifstream file(path);
-    T result;
-
-    file >> result;
-    return file.fail() ? def : result;
-}
-
-Return<bool> PowerShare::isEnabled() {
-    const auto value = get<std::string>(WIRELESS_TX_ENABLE_PATH, "");
-    return !(value == "disable" || value == "0");
-}
-
-Return<bool> PowerShare::setEnabled(bool enable) {
-    set(WIRELESS_TX_ENABLE_PATH, enable ? 1 : 0);
-
-    return isEnabled();
-}
-
-Return<uint32_t> PowerShare::getMinBattery() {
-    return 0;
-}
-
-Return<uint32_t> PowerShare::setMinBattery(uint32_t) {
-    return getMinBattery();
-}
-
-}  // namespace implementation
-}  // namespace V1_0
-}  // namespace powershare
-}  // namespace lineage
-}  // namespace vendor

powershare/PowerShare.h

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-#ifndef VENDOR_LINEAGE_POWERSHARE_V1_0_POWERSHARE_H
-#define VENDOR_LINEAGE_POWERSHARE_V1_0_POWERSHARE_H
-
-#include <vendor/lineage/powershare/1.0/IPowerShare.h>
-
-namespace vendor {
-namespace lineage {
-namespace powershare {
-namespace V1_0 {
-namespace implementation {
-
-using ::android::sp;
-using ::android::hardware::Return;
-using ::android::hardware::Void;
-
-class PowerShare : public IPowerShare {
-  public:
-    Return<bool> isEnabled() override;
-    Return<bool> setEnabled(bool enable) override;
-    Return<uint32_t> getMinBattery() override;
-    Return<uint32_t> setMinBattery(uint32_t minBattery) override;
-};
-
-}  // namespace implementation
-}  // namespace V1_0
-}  // namespace powershare
-}  // namespace lineage
-}  // namespace vendor
-
-#endif  // VENDOR_LINEAGE_POWERSHARE_V1_0_POWERSHARE_H

powershare/service.cpp

@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-#define LOG_TAG "vendor.lineage.powershare@1.0-service.xiaomi_mondrian"
-
-#include <android-base/logging.h>
-#include <hidl/HidlTransportSupport.h>
-
-#include "PowerShare.h"
-
-using android::hardware::configureRpcThreadpool;
-using android::hardware::joinRpcThreadpool;
-
-using vendor::lineage::powershare::V1_0::IPowerShare;
-using vendor::lineage::powershare::V1_0::implementation::PowerShare;
-
-using android::OK;
-using android::status_t;
-
-int main() {
-    android::sp<IPowerShare> service = new PowerShare();
-
-    configureRpcThreadpool(1, true);
-
-    status_t status = service->registerAsService();
-    if (status != OK) {
-        LOG(ERROR) << "Cannot register PowerShare HAL service.";
-        return 1;
-    }
-
-    LOG(INFO) << "PowerShare HAL service ready.";
-
-    joinRpcThreadpool();
-
-    LOG(ERROR) << "PowerShare HAL service failed to join thread pool.";
-    return 1;
-}

powershare/vendor.lineage.powershare@1.0-service.xiaomi_mondrian.rc

@@ -1,8 +0,0 @@
-on boot 
-    chown system system /sys/class/qcom-battery/reverse_chg_mode
-    chmod 0644 /sys/class/qcom-battery/reverse_chg_mode
-
-service vendor.powershare-hal-1-0 /vendor/bin/hw/vendor.lineage.powershare@1.0-service.xiaomi_mondrian
-    class hal
-    user system
-    group system

powershare/vendor.lineage.powershare@1.0-service.xiaomi_mondrian.xml

@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>vendor.lineage.powershare</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IPowerShare</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>

proprietary-files.txt

@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from OS2.0.3.0.VMNMIXM
+# All unpinned blobs below are extracted from OS2.0.9.0.VMNMIXM
 
 # ACDB
 vendor/etc/acdbdata/IDP_UPD/IDP_UPD_acdb_cal.acdb
@@ -1934,7 +1934,7 @@ vendor/lib64/libqtikeymaster4.so
 vendor/bin/hw/android.hardware.security.keymint-service-qti
 vendor/etc/init/android.hardware.security.keymint-service-qti.rc
 vendor/etc/permissions/android.hardware.hardware_keystore.xml
-vendor/etc/vintf/manifest/android.hardware.security.keymint-service-qti-rkp.xml
+vendor/etc/vintf/manifest/android.hardware.security.keymint-service-qti.xml
 vendor/lib64/libqtikeymint.so
 
 # Listen