From d4836bac37ebd9443960410f36299d0e591e3a25 Mon Sep 17 00:00:00 2001 From: Shirayuki39 Date: Wed, 14 Aug 2024 13:38:17 +0800 Subject: [PATCH] [Squash] Remove DT2W service and helper * I'm fixing powerhint instead, shirayuki-dt2w doesn't start on boot Revert "LG8n: rootdir: Start shirayuki-dt2w on late_start" This reverts commit f2c2c98f24f1520595f2f226c43c2eb8b1c5b031. Revert "LG8n: fixup!: Fix Android.bp" This reverts commit 75f87d9602ebaba0397f64cdfa0a53a8a23f6d5c. Revert "LG8n: Introduce shirayuki-dt2w service as a helper for DT2W service app" This reverts commit 9407fb90fbd6e18d2c315bdbf74da1bd94d3790a. Revert "LG8n: remove xiaomi-touch from dt2w Android.bp" This reverts commit f5d0d8ae8fc9b7d84ff5cfa813d2ab434f267660. Revert "LG8n: Import DT2w service from HOAMSI's rom" This reverts commit 64ff4cb6e85cf7bca695f20cfa731fa954d0fa56. --- device.mk | 4 -- dt2w/Android.bp | 51 -------------- dt2w/AndroidManifest.xml | 23 ------ ...rmissions_co.potatoproject.dt2w.MT6789.xml | 18 ----- dt2w/res/values-zh-rCN/strings.xml | 4 -- dt2w/res/values/strings.xml | 4 -- dt2w/shirayuki-dt2w.c | 70 ------------------- .../dt2w/MT6789/DT2WServiceMT6789.java | 66 ----------------- .../dt2w/MT6789/OnBootCompleteReceiver.java | 14 ---- rootdir/etc/init/hw/init.project.rc | 6 -- 10 files changed, 260 deletions(-) delete mode 100644 dt2w/Android.bp delete mode 100644 dt2w/AndroidManifest.xml delete mode 100644 dt2w/privapp-permissions_co.potatoproject.dt2w.MT6789.xml delete mode 100644 dt2w/res/values-zh-rCN/strings.xml delete mode 100644 dt2w/res/values/strings.xml delete mode 100644 dt2w/shirayuki-dt2w.c delete mode 100644 dt2w/src/co/potatoproject/dt2w/MT6789/DT2WServiceMT6789.java delete mode 100644 dt2w/src/co/potatoproject/dt2w/MT6789/OnBootCompleteReceiver.java diff --git a/device.mk b/device.mk index 19f9a0c..1e04e34 100644 --- a/device.mk +++ b/device.mk @@ -151,10 +151,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.drm@1.4.vendor -# DT2W -PRODUCT_PACKAGES += \ - DT2W-Service-MT6789 - # Dynamic partitions PRODUCT_USE_DYNAMIC_PARTITIONS := true diff --git a/dt2w/Android.bp b/dt2w/Android.bp deleted file mode 100644 index 52ed637..0000000 --- a/dt2w/Android.bp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2020 The Potato Open Sauce 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. - */ - - -android_app { - name: "DT2W-Service-MT6789", - - srcs: ["src/**/*.java"], - resource_dirs: ["res"], - - certificate: "platform", - platform_apis: true, - privileged: true, - - optimize: { - enabled: false, - }, - - required: [ - "privapp-permissions_co.potatoproject.dt2w.MT6789", - "shirayuki-dt2w" - ] -} - -prebuilt_etc { - name: "privapp-permissions_co.potatoproject.dt2w.MT6789", - sub_dir: "permissions", - src: "privapp-permissions_co.potatoproject.dt2w.MT6789.xml", - filename_from_src: true, -} - -cc_binary { - name: "shirayuki-dt2w", - srcs: [ - "shirayuki-dt2w.c", - ], - vendor: true -} diff --git a/dt2w/AndroidManifest.xml b/dt2w/AndroidManifest.xml deleted file mode 100644 index e2fd689..0000000 --- a/dt2w/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/dt2w/privapp-permissions_co.potatoproject.dt2w.MT6789.xml b/dt2w/privapp-permissions_co.potatoproject.dt2w.MT6789.xml deleted file mode 100644 index 0d215d8..0000000 --- a/dt2w/privapp-permissions_co.potatoproject.dt2w.MT6789.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/dt2w/res/values-zh-rCN/strings.xml b/dt2w/res/values-zh-rCN/strings.xml deleted file mode 100644 index de95df6..0000000 --- a/dt2w/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 双击唤醒服务 - diff --git a/dt2w/res/values/strings.xml b/dt2w/res/values/strings.xml deleted file mode 100644 index a25f217..0000000 --- a/dt2w/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - DT2W Service - diff --git a/dt2w/shirayuki-dt2w.c b/dt2w/shirayuki-dt2w.c deleted file mode 100644 index c60ce9c..0000000 --- a/dt2w/shirayuki-dt2w.c +++ /dev/null @@ -1,70 +0,0 @@ -#include -#include -#include -#include - -#define GESTURE_FUNCTION_PATH "/proc/gesture_function" -#define GESTURE_STATE_PATH "/proc/gesture_state" -#define DT2W_STATE_PROP "persist.sys.MT6789.dt2w" - -// me noob sar - -// sounds like a great idea, with the best of intentions - -int main() { - FILE *fp, *fpState; - char cmd[100]; - char buffer[20]; - char stateBuffer[20]; - - // Wait until we finish boot - sprintf(cmd, "getprop sys.boot_completed"); - while (system(cmd) != 0); // Assuming 'getprop' returns 0 when boot is completed - - // Main loop to continuously monitor and adjust gesture function - while (1) { - sprintf(cmd, "getprop %s", DT2W_STATE_PROP); - fp = popen(cmd, "r"); - if (fp == NULL) { - printf("prop not found\n"); - exit(1); - } - - fgets(buffer, sizeof(buffer)-1, fp); - pclose(fp); - - // Remove trailing newline character, just so it's clean - buffer[strcspn(buffer, "\n")] = 0; - - // see if gesture_state nude already has the value we want - sprintf(cmd, "awk '/cc:/ {print $2}' %s", GESTURE_STATE_PATH); - fpState = popen(cmd, "r"); - if (fpState != NULL) { - fgets(stateBuffer, sizeof(stateBuffer)-1, fpState); - pclose(fpState); - - // Remove trailing newline character - stateBuffer[strcspn(stateBuffer, "\n")] = 0; - - if ((strcmp(buffer, "0") == 0 && strcmp(stateBuffer, "cc:0") != 0) || - (strcmp(buffer, "1") == 0 && strcmp(stateBuffer, "cc:1") != 0)) { - // it doesn't have the value we want, go write - fp = fopen(GESTURE_FUNCTION_PATH, "w"); - if (fp != NULL) { - if (strcmp(buffer, "0") == 0) { - fputs("cc2", fp); - } else if (strcmp(buffer, "1") == 0) { - fputs("cc1", fp); - } - fclose(fp); - } - } - } else { - printf("Failed to read gesture state\n"); - } - - sleep(1); // Sleep for 1 second before checking again - } - - return 0; -} diff --git a/dt2w/src/co/potatoproject/dt2w/MT6789/DT2WServiceMT6789.java b/dt2w/src/co/potatoproject/dt2w/MT6789/DT2WServiceMT6789.java deleted file mode 100644 index 3a0e76d..0000000 --- a/dt2w/src/co/potatoproject/dt2w/MT6789/DT2WServiceMT6789.java +++ /dev/null @@ -1,66 +0,0 @@ -package co.potatoproject.dt2w.MT6789; - -import android.app.Service; -import android.content.ContentResolver; -import android.content.Context; -import android.content.Intent; -import android.database.ContentObserver; -import android.net.Uri; -import android.os.Handler; -import android.os.IBinder; -import android.os.Looper; -import android.os.SystemProperties; -import android.os.UserHandle; -import android.provider.Settings.Secure; - -public class DT2WServiceMT6789 extends Service { - private static final String TAG = "DT2WServiceMT6789"; - private Context mContext; - private Handler mHandler; - private CustomSettingsObserver mCustomSettingsObserver; - - @Override - public IBinder onBind(Intent intent) { - return null; - } - - @Override - public void onDestroy() { - super.onDestroy(); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startid) { - mContext = this; - mHandler = new Handler(Looper.getMainLooper()); - mCustomSettingsObserver = new CustomSettingsObserver(mHandler); - mCustomSettingsObserver.observe(); - mCustomSettingsObserver.update(); - return START_STICKY; - } - - private class CustomSettingsObserver extends ContentObserver { - CustomSettingsObserver(Handler handler) { - super(handler); - } - - void observe() { - ContentResolver resolver = mContext.getContentResolver(); - resolver.registerContentObserver(Secure.getUriFor(Secure.DOUBLE_TAP_TO_WAKE), - false, this, UserHandle.USER_CURRENT); - } - - void update() { - int dt2wValue = Secure.getInt(mContext.getContentResolver(), Secure.DOUBLE_TAP_TO_WAKE, 0); - boolean dt2wEnabled = dt2wValue == 1; - SystemProperties.set("persist.sys.MT6789.dt2w", dt2wEnabled ? "1" : "0"); - } - - @Override - public void onChange(boolean selfChange, Uri uri) { - if (uri.equals(Secure.getUriFor(Secure.DOUBLE_TAP_TO_WAKE))) { - update(); - } - } - } -} diff --git a/dt2w/src/co/potatoproject/dt2w/MT6789/OnBootCompleteReceiver.java b/dt2w/src/co/potatoproject/dt2w/MT6789/OnBootCompleteReceiver.java deleted file mode 100644 index 1b892c9..0000000 --- a/dt2w/src/co/potatoproject/dt2w/MT6789/OnBootCompleteReceiver.java +++ /dev/null @@ -1,14 +0,0 @@ -package co.potatoproject.dt2w.MT6789; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.os.Build; -import android.os.UserHandle; - -public class OnBootCompleteReceiver extends BroadcastReceiver { - public void onReceive(Context context, Intent intent) { - Intent sIntent = new Intent(context, DT2WServiceMT6789.class); - context.startServiceAsUser(sIntent, UserHandle.CURRENT); - } -} diff --git a/rootdir/etc/init/hw/init.project.rc b/rootdir/etc/init/hw/init.project.rc index 074bf6c..d3d6b20 100644 --- a/rootdir/etc/init/hw/init.project.rc +++ b/rootdir/etc/init/hw/init.project.rc @@ -102,9 +102,3 @@ on property:sys.boot_completed=1 write /sys/kernel/tracing/instances/mmstat/events/mmstat/enable 1 write /sys/kernel/tracing/instances/mmstat/tracing_on 1 -# Shirayuki-DT2W Helper Service -service shirayuki_dt2w /vendor/bin/shirayuki-dt2w - class late_start - user root - group root - oneshot