From 59d81c8cfb8fd39b3fe48aed85f96590459bebf8 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Mon, 26 Sep 2022 23:02:33 -0600 Subject: [PATCH] dubai: Drop lineage touch I don't currently see a way to modify high touch polling rate... If in the future a way is found? We can always revert this anyways but for now it's better to remove it instead of having a placebo toggle that doesn't do anything. Change-Id: Ie40e3f80724335503ce213602312f89c34058291 --- touch/.clang-format | 11 ---- touch/Android.bp | 34 ------------ touch/HighTouchPollingRate.cpp | 52 ------------------- touch/HighTouchPollingRate.h | 40 -------------- touch/service.cpp | 43 --------------- .../vendor.lineage.touch@1.0-service.dubai.rc | 5 -- ...vendor.lineage.touch@1.0-service.dubai.xml | 11 ---- 7 files changed, 196 deletions(-) delete mode 100644 touch/.clang-format delete mode 100644 touch/Android.bp delete mode 100644 touch/HighTouchPollingRate.cpp delete mode 100644 touch/HighTouchPollingRate.h delete mode 100644 touch/service.cpp delete mode 100644 touch/vendor.lineage.touch@1.0-service.dubai.rc delete mode 100644 touch/vendor.lineage.touch@1.0-service.dubai.xml diff --git a/touch/.clang-format b/touch/.clang-format deleted file mode 100644 index ae4a451..0000000 --- a/touch/.clang-format +++ /dev/null @@ -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 diff --git a/touch/Android.bp b/touch/Android.bp deleted file mode 100644 index 1c54de2..0000000 --- a/touch/Android.bp +++ /dev/null @@ -1,34 +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 { - name: "vendor.lineage.touch@1.0-service.dubai", - vintf_fragments: ["vendor.lineage.touch@1.0-service.dubai.xml"], - init_rc: ["vendor.lineage.touch@1.0-service.dubai.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", - ], -} diff --git a/touch/HighTouchPollingRate.cpp b/touch/HighTouchPollingRate.cpp deleted file mode 100644 index bfa9152..0000000 --- a/touch/HighTouchPollingRate.cpp +++ /dev/null @@ -1,52 +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 "HighTouchPollingRateService" - -#include "HighTouchPollingRate.h" - -#include - -namespace vendor { -namespace lineage { -namespace touch { -namespace V1_0 { -namespace implementation { - -const std::string kInterpolationPath = "/sys/class/touchscreen/primary/interpolation"; - -Return HighTouchPollingRate::isEnabled() { - std::ifstream file(kInterpolationPath); - int enabled; - file >> enabled; - - if(enabled == 1) - return true; - - return false; -} - -Return 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 diff --git a/touch/HighTouchPollingRate.h b/touch/HighTouchPollingRate.h deleted file mode 100644 index 548654a..0000000 --- a/touch/HighTouchPollingRate.h +++ /dev/null @@ -1,40 +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. - */ - -#pragma once - -#include - -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 isEnabled() override; - Return setEnabled(bool enabled) override; -}; - -} // namespace implementation -} // namespace V1_0 -} // namespace touch -} // namespace lineage -} // namespace vendor diff --git a/touch/service.cpp b/touch/service.cpp deleted file mode 100644 index f488e91..0000000 --- a/touch/service.cpp +++ /dev/null @@ -1,43 +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 "lineage.touch@1.0-service.dubai" - -#include -#include - -#include "HighTouchPollingRate.h" - -using ::vendor::lineage::touch::V1_0::IHighTouchPollingRate; -using ::vendor::lineage::touch::V1_0::implementation::HighTouchPollingRate; - -int main() { - android::sp 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; -} diff --git a/touch/vendor.lineage.touch@1.0-service.dubai.rc b/touch/vendor.lineage.touch@1.0-service.dubai.rc deleted file mode 100644 index 12dc28a..0000000 --- a/touch/vendor.lineage.touch@1.0-service.dubai.rc +++ /dev/null @@ -1,5 +0,0 @@ -service vendor.touch-hal-1-0 /vendor/bin/hw/vendor.lineage.touch@1.0-service.dubai - interface vendor.lineage.touch@1.0::IHighTouchPollingRate default - class hal - user system - group system diff --git a/touch/vendor.lineage.touch@1.0-service.dubai.xml b/touch/vendor.lineage.touch@1.0-service.dubai.xml deleted file mode 100644 index 0a42036..0000000 --- a/touch/vendor.lineage.touch@1.0-service.dubai.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - vendor.lineage.touch - hwbinder - 1.0 - - IHighTouchPollingRate - default - - -