berlna: Switch to Touch AIDL

Change-Id: Id4fcd7ca97b04f887dec6939419815722097d10c
This commit is contained in:
Bruno Martins
2025-06-07 18:38:16 +01:00
committed by Nolen Johnson
parent b8ad29c31b
commit 5783580ae6
8 changed files with 6 additions and 157 deletions

View File

@@ -61,10 +61,6 @@ PRODUCT_PACKAGES += \
init.recovery.berlna.rc \
load_touch.sh.recovery
# Lineage Touch
PRODUCT_PACKAGES += \
vendor.lineage.touch@1.0-service.berlna
# Lights
PRODUCT_PACKAGES += \
android.hardware.light-service.lineage
@@ -90,5 +86,11 @@ PRODUCT_COPY_FILES += \
PRODUCT_SOONG_NAMESPACES += \
$(LOCAL_PATH)
# Touch HAL
PRODUCT_PACKAGES += \
vendor.lineage.touch-service.motorola
$(call soong_config_set, MOTOROLA_TOUCH, HIGH_TOUCH_POLLING_PATH, /sys/class/touchscreen/primary/interpolation)
# Inherit from vendor blobs
$(call inherit-product, vendor/motorola/berlna/berlna-vendor.mk)

View File

@@ -1,11 +0,0 @@
BasedOnStyle: Google
AccessModifierOffset: -2
AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IndentWidth: 4
PointerAlignment: Left
TabWidth: 4
UseTab: Never
PenaltyExcessCharacter: 32

View File

@@ -1,24 +0,0 @@
//
// SPDX-FileCopyrightText: The LineageOS Project
// SPDX-License-Identifier: Apache-2.0
//
cc_binary {
name: "vendor.lineage.touch@1.0-service.berlna",
vintf_fragments: ["vendor.lineage.touch@1.0-service.berlna.xml"],
init_rc: ["vendor.lineage.touch@1.0-service.berlna.rc"],
defaults: ["hidl_defaults"],
relative_install_path: "hw",
proprietary: true,
srcs: [
"HighTouchPollingRate.cpp",
"service.cpp",
],
shared_libs: [
"libbase",
"libbinder",
"libhidlbase",
"libutils",
"vendor.lineage.touch@1.0",
],
}

View File

@@ -1,41 +0,0 @@
/*
* SPDX-FileCopyrightText: The LineageOS Project
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_TAG "HighTouchPollingRateService"
#include "HighTouchPollingRate.h"
#include <fstream>
namespace vendor {
namespace lineage {
namespace touch {
namespace V1_0 {
namespace implementation {
const std::string kInterpolationPath = "/sys/class/touchscreen/primary/interpolation";
Return<bool> HighTouchPollingRate::isEnabled() {
std::ifstream file(kInterpolationPath);
int enabled;
file >> enabled;
if(enabled == 1)
return true;
return false;
}
Return<bool> HighTouchPollingRate::setEnabled(bool enabled) {
std::ofstream file(kInterpolationPath);
file << (enabled ? "1" : "0");
return !file.fail();
}
} // namespace implementation
} // namespace V1_0
} // namespace touch
} // namespace lineage
} // namespace vendor

View File

@@ -1,29 +0,0 @@
/*
* SPDX-FileCopyrightText: The LineageOS Project
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include <vendor/lineage/touch/1.0/IHighTouchPollingRate.h>
namespace vendor {
namespace lineage {
namespace touch {
namespace V1_0 {
namespace implementation {
using ::android::hardware::Return;
class HighTouchPollingRate : public IHighTouchPollingRate {
public:
// Methods from ::vendor::lineage::touch::V1_0::IHighTouchPollingRate follow.
Return<bool> isEnabled() override;
Return<bool> setEnabled(bool enabled) override;
};
} // namespace implementation
} // namespace V1_0
} // namespace touch
} // namespace lineage
} // namespace vendor

View File

@@ -1,32 +0,0 @@
/*
* SPDX-FileCopyrightText: The LineageOS Project
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_TAG "lineage.touch@1.0-service.berlna"
#include <android-base/logging.h>
#include <hidl/HidlTransportSupport.h>
#include "HighTouchPollingRate.h"
using ::vendor::lineage::touch::V1_0::IHighTouchPollingRate;
using ::vendor::lineage::touch::V1_0::implementation::HighTouchPollingRate;
int main() {
android::sp<IHighTouchPollingRate> highTouchPollingRate = new HighTouchPollingRate();
android::hardware::configureRpcThreadpool(1, true /*callerWillJoin*/);
if (highTouchPollingRate->registerAsService() != android::OK) {
LOG(ERROR) << "Cannot register touchscreen high polling rate HAL service.";
return 1;
}
LOG(INFO) << "Touchscreen HAL service ready.";
android::hardware::joinRpcThreadpool();
LOG(ERROR) << "Touchscreen HAL service failed to join thread pool.";
return 1;
}

View File

@@ -1,5 +0,0 @@
service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.berlna
interface vendor.lineage.touch@1.0::IHighTouchPollingRate default
class hal
user system
group system

View File

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