From 65dd75e8f96573585e4083f9924367edb7231318 Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Sat, 26 Nov 2022 22:28:48 +0100 Subject: [PATCH] sm7125-common: Add UdfpsHandler for NightDisplay and ExtraDim *Optical fingerprint sensors don't like NightDisplay and ExtraDim since those decrease overall sensor accuracy *Turn ExtraDim off and set NightDisplay's color temperature to AOSP's default white balance value if the fingerprint sensor is touched Change-Id: I6651cd5c8c066102feebfb764184b099c6ad741d --- common.mk | 3 +- fingerprint/Android.mk | 1 + fingerprint/BiometricsFingerprint.cpp | 3 + udfps/Android.mk | 20 ++++ udfps/AndroidManifest.xml | 28 +++++ .../display/BootCompletedReceiver.java | 34 ++++++ .../display/SamsungUdfpsHandlerService.java | 107 ++++++++++++++++++ udfps/src/android/hardware/display/Utils.java | 40 +++++++ 8 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 udfps/Android.mk create mode 100644 udfps/AndroidManifest.xml create mode 100644 udfps/src/android/hardware/display/BootCompletedReceiver.java create mode 100644 udfps/src/android/hardware/display/SamsungUdfpsHandlerService.java create mode 100644 udfps/src/android/hardware/display/Utils.java diff --git a/common.mk b/common.mk index 218b975..3bbe7b6 100644 --- a/common.mk +++ b/common.mk @@ -179,7 +179,8 @@ PRODUCT_PACKAGES += \ # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.3-service-samsung.sm7125 + android.hardware.biometrics.fingerprint@2.3-service-samsung.sm7125 \ + SamsungUdfpsHandler.sm7125 # fastbootd PRODUCT_PACKAGES += \ diff --git a/fingerprint/Android.mk b/fingerprint/Android.mk index 3815590..576a718 100644 --- a/fingerprint/Android.mk +++ b/fingerprint/Android.mk @@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := \ libhidlbase \ liblog \ libutils \ + libcutils \ android.hardware.biometrics.fingerprint@2.1 \ android.hardware.biometrics.fingerprint@2.2 \ android.hardware.biometrics.fingerprint@2.3 diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp index 64bb2da..7316ad1 100644 --- a/fingerprint/BiometricsFingerprint.cpp +++ b/fingerprint/BiometricsFingerprint.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef HAS_FINGERPRINT_GESTURES #include @@ -125,6 +126,8 @@ Return BiometricsFingerprint::isUdfps(uint32_t) { } Return BiometricsFingerprint::onFingerDown(uint32_t, uint32_t, float, float) { + property_set("vendor.finger.down", "1"); + std::thread([this]() { std::this_thread::sleep_for(std::chrono::milliseconds(35)); set(HBM_PATH, "331"); diff --git a/udfps/Android.mk b/udfps/Android.mk new file mode 100644 index 0000000..a591916 --- /dev/null +++ b/udfps/Android.mk @@ -0,0 +1,20 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_PACKAGE_NAME := SamsungUdfpsHandler.sm7125 +LOCAL_CERTIFICATE := platform +LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_PRIVILEGED_MODULE := true + +LOCAL_USE_AAPT2 := true + +ifneq ($(INCREMENTAL_BUILDS),) + LOCAL_PROGUARD_ENABLED := disabled + LOCAL_JACK_ENABLED := incremental +endif + +include $(BUILD_PACKAGE) diff --git a/udfps/AndroidManifest.xml b/udfps/AndroidManifest.xml new file mode 100644 index 0000000..1718085 --- /dev/null +++ b/udfps/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/udfps/src/android/hardware/display/BootCompletedReceiver.java b/udfps/src/android/hardware/display/BootCompletedReceiver.java new file mode 100644 index 0000000..6e399a2 --- /dev/null +++ b/udfps/src/android/hardware/display/BootCompletedReceiver.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 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. + */ + +package android.hardware.display; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.util.Log; + +public class BootCompletedReceiver extends BroadcastReceiver { + + private static final boolean DEBUG = false; + private static final String TAG = "SamsungUdfpsHandler"; + + @Override + public void onReceive(final Context context, Intent intent) { + if (DEBUG) Log.d(TAG, "Received boot completed intent"); + Utils.startService(context); + } +} diff --git a/udfps/src/android/hardware/display/SamsungUdfpsHandlerService.java b/udfps/src/android/hardware/display/SamsungUdfpsHandlerService.java new file mode 100644 index 0000000..e3a8585 --- /dev/null +++ b/udfps/src/android/hardware/display/SamsungUdfpsHandlerService.java @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2022 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. + */ + +package android.hardware.display; + +import android.app.Service; +import android.content.Intent; +import android.hardware.display.ColorDisplayManager; +import android.os.SystemProperties; +import android.os.IBinder; +import android.util.Log; +import android.os.Handler; + +public class SamsungUdfpsHandlerService extends Service { + private static final String TAG = "SamsungUdfpsHandler"; + private static final boolean DEBUG = false; + + private int mNightDisplayTemp = 0; + private boolean mExtraDimActive = false; + + private ColorDisplayManager mColorDisplayManager; + private Handler mHandler; + private static Runnable mRunnable; + + private void disable() { + if (DEBUG) Log.d(TAG, "Finger down, set NightDisplay and ExtraDim off"); + + mNightDisplayTemp = mColorDisplayManager.getNightDisplayColorTemperature(); + + if (mColorDisplayManager.isNightDisplayActivated()) { + // 6500 Kelvin is AOSP's default white balance value + mColorDisplayManager.setNightDisplayColorTemperature(6500); + } + + if (mColorDisplayManager.isReduceBrightColorsActivated()) { + mExtraDimActive = true; + mColorDisplayManager.setReduceBrightColorsActivated(false); + } + + SystemProperties.set("vendor.finger.down", "0"); + } + + private void enable() { + if (DEBUG) Log.d(TAG, "Finger up, reset NightDisplay and ExtraDim to previous state"); + + SystemProperties.set("vendor.finger.down", "-1"); + + mColorDisplayManager.setNightDisplayColorTemperature(mNightDisplayTemp); + mColorDisplayManager.setReduceBrightColorsActivated(mExtraDimActive); + + mExtraDimActive = false; + } + + @Override + public void onCreate() { + if (DEBUG) Log.d(TAG, "SamsungUdfpsHandler Started"); + mColorDisplayManager = getSystemService(ColorDisplayManager.class); + + SystemProperties.set("vendor.finger.down", "-1"); + + mHandler = new Handler(); + mRunnable = new Runnable() { + public void run() { + if (DEBUG) Log.d(TAG, "onCreate: " + TAG + " is running"); + + if (SystemProperties.get("vendor.finger.down").equals("1")) { + disable(); + try { + Thread.sleep(2000); + } + catch (InterruptedException e) { + e.printStackTrace(); + } + } else if (SystemProperties.get("vendor.finger.down").equals("0")) { + enable(); + } + mHandler.postDelayed(mRunnable, 100); + } + }; + + mHandler.postDelayed(mRunnable, 0); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (DEBUG) Log.d(TAG, "Starting service"); + return START_STICKY; + } + + @Override + public IBinder onBind(Intent intent) { + return null; + } +} diff --git a/udfps/src/android/hardware/display/Utils.java b/udfps/src/android/hardware/display/Utils.java new file mode 100644 index 0000000..070d5f7 --- /dev/null +++ b/udfps/src/android/hardware/display/Utils.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2022 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. + */ + +package android.hardware.display; + +import android.content.Context; +import android.content.Intent; +import android.os.UserHandle; +import android.util.Log; + +public final class Utils { + + private static final String TAG = "UDFPSUtils"; + private static final boolean DEBUG = false; + + protected static void startService(Context context) { + if (DEBUG) Log.d(TAG, "Starting service"); + context.startServiceAsUser(new Intent(context, SamsungUdfpsHandlerService.class), + UserHandle.CURRENT); + } + + protected static void stopService(Context context) { + if (DEBUG) Log.d(TAG, "Stopping service"); + context.stopServiceAsUser(new Intent(context, SamsungUdfpsHandlerService.class), + UserHandle.CURRENT); + } +}