Changes for May 2022, syncing up to v413

This commit is contained in:
Andy CrossGate Yan
2022-05-12 00:37:03 +00:00
parent 3f1880e5fa
commit 969f476c22
104 changed files with 918 additions and 999 deletions

View File

@@ -1,7 +1,7 @@
From a194fe441f38c5844b1b40ad89dc8c46ce15283b Mon Sep 17 00:00:00 2001
From 6e3563653fb94e815a76e98ab2db682b1120734b Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 5 Aug 2019 18:09:50 +0200
Subject: [PATCH 01/21] Fix BT in-call on CAF devices
Subject: [PATCH 01/23] Fix BT in-call on CAF devices
See https://github.com/phhusson/treble_experimentations/issues/374

View File

@@ -1,7 +1,7 @@
From 60072fd9b20c55faca220cee207ac63a506690cb Mon Sep 17 00:00:00 2001
From 439f07ebcd8f22ae8a7ec5c59386967d8cb953f5 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 1 Oct 2019 13:35:49 +0200
Subject: [PATCH 02/21] Add (partial, cam id is hardcoded) support for Asus ZF6
Subject: [PATCH 02/23] Add (partial, cam id is hardcoded) support for Asus ZF6
motor camera
Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe

View File

@@ -1,7 +1,7 @@
From 0df456a123afa586fda489992bf2aabc569fff47 Mon Sep 17 00:00:00 2001
From 2ea65f01d378f37df840acc601a938c131fbce0b Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 23 Jan 2020 11:13:43 +0800
Subject: [PATCH 03/21] audiopolicy: try again with trimmed audio port name if
Subject: [PATCH 03/23] audiopolicy: try again with trimmed audio port name if
not found
* In Spreadtrum BSP, some audio routes may contain ports with extra

View File

@@ -1,7 +1,7 @@
From e20eeef0160a265369850933afca8308c1ae8d65 Mon Sep 17 00:00:00 2001
From 7e1a90bc11800f0267f3a610db2f8a0b5f6cee0a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 13 Apr 2020 21:01:16 +0200
Subject: [PATCH 04/21] There are three SCO devices. Fallback from one to the
Subject: [PATCH 04/23] There are three SCO devices. Fallback from one to the
others if needed
Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2

View File

@@ -1,7 +1,7 @@
From ec32f391f2e32d57996d633ca0ed69fe8a8a7702 Mon Sep 17 00:00:00 2001
From c8a3d642465a97ca862de7840ddc7522ed13037d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 14 May 2020 19:54:55 +0200
Subject: [PATCH 05/21] Add persist.sys.phh.samsung.camera_ids property to
Subject: [PATCH 05/23] Add persist.sys.phh.samsung.camera_ids property to
access hidden Samsung cameras
Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593

View File

@@ -1,7 +1,7 @@
From 7e4e53bb24ba8c02be74fb76abbf91d0db47c218 Mon Sep 17 00:00:00 2001
From ba8531becc9b9cb3acafd25ef99c30228120a932 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 19 May 2020 14:01:14 +0200
Subject: [PATCH 06/21] Add a property to force camera timestamp source
Subject: [PATCH 06/23] Add a property to force camera timestamp source
Some devices wrongly report their timesource
Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME

View File

@@ -1,7 +1,7 @@
From f1bcd5087da97f44f857c2fa541bb37b3fdc6d9d Mon Sep 17 00:00:00 2001
From 08e26789bcc3c2ce86c2f2158a384404dd718165 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 24 Apr 2018 00:14:28 +0200
Subject: [PATCH 07/21] FIH devices: Fix "Earpiece" audio output
Subject: [PATCH 07/23] FIH devices: Fix "Earpiece" audio output
On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
Earpiece is not listed in attachedDevices, and devicePort's profile

View File

@@ -1,7 +1,7 @@
From 70bcea5cf514fbff58e39ca049542c9a73125e1a Mon Sep 17 00:00:00 2001
From 692a52722f8d42cf9050debaba290cd26c628a04 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 12 Sep 2020 12:32:50 +0200
Subject: [PATCH 08/21] No longer make re-assigning legacy audio groups fatal.
Subject: [PATCH 08/23] No longer make re-assigning legacy audio groups fatal.
Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
by framework too

View File

@@ -1,7 +1,7 @@
From ffe42225949b781674c2a66056b5bab3a707c2be Mon Sep 17 00:00:00 2001
From 294fd56f000ff05d3982c6a0342f85ab07f85a51 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 25 May 2020 21:26:54 +0200
Subject: [PATCH 09/21] Add persist.sys.phh.disable_a2dp_offload property to
Subject: [PATCH 09/23] Add persist.sys.phh.disable_a2dp_offload property to
force a2dp offload
Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea

View File

@@ -1,7 +1,7 @@
From b61abf82f851557f5b8de4da800f3e9297917602 Mon Sep 17 00:00:00 2001
From 5bd6c2771efe985f945be22f8855042ec8d36615 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 21 Dec 2020 20:19:11 +0100
Subject: [PATCH 10/21] Make camera IDs filter-out optional
Subject: [PATCH 10/23] Make camera IDs filter-out optional
Nowadays most people have Camera 2 apps, and would like to have all
cameras, rather than limit which cameras are available.

View File

@@ -1,7 +1,7 @@
From 031c6f960ea02acf8e43779c8f7e19d2c6ccad15 Mon Sep 17 00:00:00 2001
From abab867d1e0f291606e107bc951d89087524dad9 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 13 Mar 2021 14:20:03 -0500
Subject: [PATCH 11/21] Support Samsung R multi-cams
Subject: [PATCH 11/23] Support Samsung R multi-cams
Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
---

View File

@@ -1,7 +1,7 @@
From c96b60d01a1b131092218cd3810bf2c0cdd71c70 Mon Sep 17 00:00:00 2001
From 7331481390a299313bf5bd94a419efc652b04e5e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 23 Mar 2021 00:16:42 +0100
Subject: [PATCH 12/21] Don't crash on unknown audio devices
Subject: [PATCH 12/23] Don't crash on unknown audio devices
Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
---

View File

@@ -1,7 +1,7 @@
From 98695ce56229f55bd5c5bc4856f105d6f02d2ebf Mon Sep 17 00:00:00 2001
From 5ce3705dec69f9b26d5e6b9d97c5acef6937c1f3 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 28 Mar 2021 14:47:52 +0200
Subject: [PATCH 13/21] Reenable STRATEGY_ROUTING. This is a leftover of tries
Subject: [PATCH 13/23] Reenable STRATEGY_ROUTING. This is a leftover of tries
of 587b198, wrongly commited in 20f869
---

View File

@@ -1,7 +1,7 @@
From 073d71259db702ec3bc4fa1f46a8c4e41a0ed776 Mon Sep 17 00:00:00 2001
From 49b6a945b6f71d4c29241f749f605a851d7bd9b2 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 28 Mar 2021 14:48:49 +0200
Subject: [PATCH 14/21] Use a fake volume policy when none has been found
Subject: [PATCH 14/23] Use a fake volume policy when none has been found
This is useful, because on Samsung devices, the "real"
(=non-gsi-cheating) audio policy doesn't have any volume policy.

View File

@@ -1,7 +1,7 @@
From 9a975152664ef309b06f1de15947a0dec2489376 Mon Sep 17 00:00:00 2001
From c8f0ce02deeeb8d126b832f929e1ead7f1f567bf Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 28 Mar 2021 18:54:47 +0200
Subject: [PATCH 15/21] Not all sources in a route are valid. Dont ignore the
Subject: [PATCH 15/23] Not all sources in a route are valid. Dont ignore the
whole route because of one broken source
Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d

View File

@@ -1,7 +1,7 @@
From 7a4aca68a3a50e50518abed26c09253b273736de Mon Sep 17 00:00:00 2001
From a04258dd8d53e6788f00ec2af118edef4e5bffae Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 7 Aug 2021 11:11:39 +0200
Subject: [PATCH 16/21] When aux cameras are enabled, ignore "system only"
Subject: [PATCH 16/23] When aux cameras are enabled, ignore "system only"
camera flag (it shouldnt be q security issue since secure cameras are listed
otherwise)

View File

@@ -1,7 +1,7 @@
From 0a0c33fe70c18a9b73925971ba0a67afe07d67da Mon Sep 17 00:00:00 2001
From cfc70e827ca50d56fbac1b4a334fad77acdf82a4 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 19 Oct 2021 21:16:55 -0400
Subject: [PATCH 17/21] APM: Restore R and Q behavior respectively for
Subject: [PATCH 17/23] APM: Restore R and Q behavior respectively for
telephony audio
This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the

View File

@@ -1,7 +1,7 @@
From 9f79402919068f9aaf1f2c47a82fd3845a35dfa2 Mon Sep 17 00:00:00 2001
From ddf03b6aeaa7d11294c4ab404d5cd50ba74cd966 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 11 Oct 2021 16:10:42 -0400
Subject: [PATCH 18/21] Revert "Remove support for audio HAL V2 from the
Subject: [PATCH 18/23] Revert "Remove support for audio HAL V2 from the
framework"
This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

View File

@@ -1,7 +1,7 @@
From d71c81ad6d3b5ab54212e281c9efeab3cb4711be Mon Sep 17 00:00:00 2001
From 5dbb242d7d2435fab6346515b723fd197331e16a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 30 Jan 2022 07:40:19 -0500
Subject: [PATCH 19/21] Fix parsing audio hal 7.0 audio policies
Subject: [PATCH 19/23] Fix parsing audio hal 7.0 audio policies
Google changed separator from natural "," to weird " "
We broke its support in "FIH devices: Fix "Earpiece" audio output"

View File

@@ -1,7 +1,7 @@
From f9496b5e570c38233be509c4b14bd0e0f36518ef Mon Sep 17 00:00:00 2001
From 84a17a2c0cd0ff029e62b8c8b0d66cbabcc20878 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 12 Mar 2022 18:07:43 -0500
Subject: [PATCH 20/21] fixup! Not all sources in a route are valid. Dont
Subject: [PATCH 20/23] fixup! Not all sources in a route are valid. Dont
ignore the whole route because of one broken source
---

View File

@@ -1,7 +1,7 @@
From 614970eca688faf496cee321f1bed312a0773c8d Mon Sep 17 00:00:00 2001
From a4877baf04cab3ea39e6cfb07dca5f192c00b4c6 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 5 Apr 2022 15:07:37 -0400
Subject: [PATCH 21/21] Next level of force disable a2dp offload: erase all
Subject: [PATCH 21/23] Next level of force disable a2dp offload: erase all
modules related to a2dp, and include our own
---

View File

@@ -0,0 +1,57 @@
From d51bb9caf00ae2736c1d2376688cbb5d273acc34 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 16 Apr 2022 14:30:14 -0400
Subject: [PATCH 22/23] Add a prop to change Samsung flash strength
---
services/camera/libcameraservice/Android.bp | 1 +
.../common/CameraProviderManager.cpp | 14 +++++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index a2a2ad623e..b616f8207f 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -156,6 +156,7 @@ cc_library_shared {
"android.hardware.camera.device@3.7",
"vendor.samsung.hardware.camera.provider@3.0",
"vendor.samsung.hardware.camera.provider@4.0",
+ "vendor.samsung.hardware.camera.device@5.0",
"media_permission-aidl-cpp",
],
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 9d26bd44d7..4577337fd2 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -23,6 +23,7 @@
#include <android/hardware/camera/device/3.7/ICameraDevice.h>
#include <vendor/samsung/hardware/camera/provider/3.0/ISehCameraProvider.h>
#include <vendor/samsung/hardware/camera/provider/4.0/ISehCameraProvider.h>
+#include <vendor/samsung/hardware/camera/device/5.0/ISehCameraDevice.h>
#include <algorithm>
#include <chrono>
@@ -2289,7 +2290,18 @@ sp<InterfaceT> CameraProviderManager::ProviderInfo::DeviceInfo::startDeviceInter
template<class InterfaceT>
status_t CameraProviderManager::ProviderInfo::DeviceInfo::setTorchMode(InterfaceT& interface,
bool enabled) {
- Status s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
+ int32_t flashStrength = property_get_int32("persist.sys.phh.flash_strength", 1);
+
+ auto sehCast = vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice::castFrom(interface);
+ android::sp<vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice> seh = sehCast;
+
+ Status s;
+ if(seh != nullptr) {
+ s = seh->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
+ } else {
+ s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
+ }
+
return mapToStatusT(s);
}
--
2.25.1

View File

@@ -0,0 +1,52 @@
From 4e0112f9890f03418d16d999a01298728f3445d9 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 May 2022 17:37:09 -0400
Subject: [PATCH 23/23] Support variable flash strength on samsung hal 4.0
---
services/camera/libcameraservice/Android.bp | 1 +
.../libcameraservice/common/CameraProviderManager.cpp | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index b616f8207f..3b99e643e5 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -157,6 +157,7 @@ cc_library_shared {
"vendor.samsung.hardware.camera.provider@3.0",
"vendor.samsung.hardware.camera.provider@4.0",
"vendor.samsung.hardware.camera.device@5.0",
+ "vendor.samsung.hardware.camera.device@4.0",
"media_permission-aidl-cpp",
],
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 4577337fd2..8b483a55c8 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -24,6 +24,7 @@
#include <vendor/samsung/hardware/camera/provider/3.0/ISehCameraProvider.h>
#include <vendor/samsung/hardware/camera/provider/4.0/ISehCameraProvider.h>
#include <vendor/samsung/hardware/camera/device/5.0/ISehCameraDevice.h>
+#include <vendor/samsung/hardware/camera/device/4.0/ISehCameraDevice.h>
#include <algorithm>
#include <chrono>
@@ -2295,9 +2296,14 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo::setTorchMode(Interface
auto sehCast = vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice::castFrom(interface);
android::sp<vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice> seh = sehCast;
+ auto sehCast2 = vendor::samsung::hardware::camera::device::V4_0::ISehCameraDevice::castFrom(interface);
+ android::sp<vendor::samsung::hardware::camera::device::V4_0::ISehCameraDevice> seh2 = sehCast2;
+
Status s;
if(seh != nullptr) {
s = seh->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
+ } else if(seh2 != nullptr) {
+ s = seh2->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength);
} else {
s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
}
--
2.25.1

View File

@@ -1,7 +1,7 @@
From 5675af56cab31009b7e40c33c0974e3155b7e132 Mon Sep 17 00:00:00 2001
From 50894d0b194706219e869070d0d0a60c2fedbd83 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 5 Oct 2021 17:59:16 -0400
Subject: [PATCH 01/31] Fallback to stupid autobrightness if brightness values
Subject: [PATCH 01/33] Fallback to stupid autobrightness if brightness values
are broken
This is needed because of:

View File

@@ -1,7 +1,7 @@
From 052ace3bdbe81360770e85176996525ea7665861 Mon Sep 17 00:00:00 2001
From 01d72f3de8dd8e1a4671d4a1f1d5bbab9241194a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Nov 2017 18:28:04 +0100
Subject: [PATCH 02/31] Relax requirement for visible flag to sdcards
Subject: [PATCH 02/33] Relax requirement for visible flag to sdcards
The vast majority of sdcard readers are stable enough to be declared by
the API. (I see no counter-example)
@@ -13,10 +13,10 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 2f29c3cb4e7c..de92ad4d47ca 100644
index ec58b1701694..40b9a18f0fb3 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1582,7 +1582,8 @@ class StorageManagerService extends IStorageManager.Stub
@@ -1583,7 +1583,8 @@ class StorageManagerService extends IStorageManager.Stub
// Adoptable public disks are visible to apps, since they meet
// public API requirement of being in a stable location.

View File

@@ -1,7 +1,7 @@
From 29116da26af1af6c2b8b929b85261e6a23b68807 Mon Sep 17 00:00:00 2001
From cb46b9da6a63fe5cb89348c03e707fc43981a465 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 17 May 2018 20:28:35 +0200
Subject: [PATCH 03/31] Don't crash if there is IR HAL is not declared
Subject: [PATCH 03/33] Don't crash if there is IR HAL is not declared
Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
---

View File

@@ -1,7 +1,7 @@
From f2300a6714aeffaba7f423f76b93f2dbb06148a7 Mon Sep 17 00:00:00 2001
From f3f8c69914b7c20bac11c3fb0a217ced1944901e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 6 Aug 2018 12:49:00 +0200
Subject: [PATCH 04/31] Show APN Settings for CDMA carriers
Subject: [PATCH 04/33] Show APN Settings for CDMA carriers
---
telephony/java/android/telephony/CarrierConfigManager.java | 2 +-

View File

@@ -1,7 +1,7 @@
From 4c4035881ae7e213433b0fc5c9c8582269302954 Mon Sep 17 00:00:00 2001
From c441a4d08d3226a89f5a9d5d54a3e092bc398bc3 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 8 Nov 2018 23:04:03 +0100
Subject: [PATCH 05/31] Re-order services so that it works even without qtaguid
Subject: [PATCH 05/33] Re-order services so that it works even without qtaguid
Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
---

View File

@@ -1,7 +1,7 @@
From 751f7e0840e5f27750a81efe9f94f6c0b484b8e5 Mon Sep 17 00:00:00 2001
From cdf6204270d189dc035fee8f21b4f73697eaa711 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 24 Mar 2019 23:05:14 +0100
Subject: [PATCH 06/31] Support samsung Pie and Q light hal
Subject: [PATCH 06/33] Support samsung Pie and Q light hal
Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
---

View File

@@ -1,7 +1,7 @@
From ed9809bbd9fe4936094d680def1efdee23f9b6b3 Mon Sep 17 00:00:00 2001
From c2c21c01856fc410d196633429f22535957a0d0f Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 12 Aug 2019 23:08:26 +0200
Subject: [PATCH 07/31] Add support for samsung touch, physical and hover
Subject: [PATCH 07/33] Add support for samsung touch, physical and hover
proximity sensor as fallback to real proximity sensor
Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
@@ -10,10 +10,10 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
1 file changed, 35 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 78d79ad2f12d..1bcd2317235b 100644
index 171fdfa5ca6d..abf4d20a1cf5 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1734,6 +1734,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -1744,6 +1744,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
? Sensor.TYPE_PROXIMITY : SensorUtils.NO_FALLBACK;
mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,
fallbackType);
@@ -41,7 +41,7 @@ index 78d79ad2f12d..1bcd2317235b 100644
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);
@@ -2499,6 +2520,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -2516,6 +2537,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
public void onSensorChanged(SensorEvent event) {
if (mProximitySensorEnabled) {
final long time = SystemClock.uptimeMillis();

View File

@@ -1,7 +1,7 @@
From b9f801be0142d92b448b2ec91fb4dafb4856791d Mon Sep 17 00:00:00 2001
From 0e304464a29e1905e64bceb63638b1a946d80720 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 5 Apr 2020 16:32:46 +0200
Subject: [PATCH 08/31] Always allow overriding the number of work profiles
Subject: [PATCH 08/33] Always allow overriding the number of work profiles
Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
---

View File

@@ -1,7 +1,7 @@
From 8c3d4fcea46de7a0b83df0ae238b09af870bbb1f Mon Sep 17 00:00:00 2001
From 1e97292318d9af4b29d450f819f1f954232473d7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 6 Jun 2020 18:21:56 +0200
Subject: [PATCH 09/31] HOME deserves to wake-up devices just as well as back
Subject: [PATCH 09/33] HOME deserves to wake-up devices just as well as back
and menu
Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a

View File

@@ -1,7 +1,7 @@
From 0c03c7a32ba5cadf840e8c599df83486a75c8cca Mon Sep 17 00:00:00 2001
From 26b1e0b7a9dd7f289d297c3af395d997efa8d4d1 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 29 Sep 2020 22:39:47 +0200
Subject: [PATCH 10/31] Some devices have proximity sensor reporting NaN as max
Subject: [PATCH 10/33] Some devices have proximity sensor reporting NaN as max
range for some reason. Make them behave standard way by setting 5 cm
Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
@@ -10,10 +10,10 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
1 file changed, 3 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 1bcd2317235b..0d5ea94da738 100644
index abf4d20a1cf5..5f7fd1b23df4 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1758,6 +1758,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -1768,6 +1768,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);

View File

@@ -1,7 +1,7 @@
From 356f356b5d061a6977e3a6d64d8b1220311b097d Mon Sep 17 00:00:00 2001
From e0837f217283c60aff22b83e43823e1411b05428 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 29 Sep 2020 22:40:10 +0200
Subject: [PATCH 11/31] Fix brightness range not being complete on Samsung
Subject: [PATCH 11/33] Fix brightness range not being complete on Samsung
devices
On some devices, minimum brightness is 0, which totally messes with

View File

@@ -1,7 +1,7 @@
From 30377055985ef3caec0085e8283200bbe106b3f8 Mon Sep 17 00:00:00 2001
From 1b94ddc6fc561f136a7e73d06b5dcdb674700270 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 25 Oct 2020 23:57:26 +0100
Subject: [PATCH 12/31] Re-implement fnmatch-like behaviour for RRO java-side
Subject: [PATCH 12/33] Re-implement fnmatch-like behaviour for RRO java-side
Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
---

View File

@@ -1,7 +1,7 @@
From efa47ee9932c87edea2f8dcb26426303c86d9a16 Mon Sep 17 00:00:00 2001
From 1d4a485384d3089b720ef47f8941fa2a7fae4708 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 6 Dec 2020 12:20:08 +0100
Subject: [PATCH 13/31] Make rounded corners padding overridable with
Subject: [PATCH 13/33] Make rounded corners padding overridable with
persist.sys.phh.rounded_corners_padding
Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9

View File

@@ -1,7 +1,7 @@
From 247a4b977e1eca76e70017b0865d6658998fa713 Mon Sep 17 00:00:00 2001
From 2d0bba690d67b91bf1fd6b73eade6200c131daa8 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 11 Dec 2020 14:41:09 +0100
Subject: [PATCH 14/31] Remove useless notification about "console" service
Subject: [PATCH 14/33] Remove useless notification about "console" service
being running
---

View File

@@ -1,7 +1,7 @@
From ca9586284beee6dbabab01517f6d0b40147d5174 Mon Sep 17 00:00:00 2001
From a6a8d7d07f710e3156ef1b3143834b23eda0e3b3 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:24:12 +0800
Subject: [PATCH 15/31] Revert "Remove unused SystemProperties.set"
Subject: [PATCH 15/33] Revert "Remove unused SystemProperties.set"
This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.

View File

@@ -1,7 +1,7 @@
From 947fd7c3edd2e182f107069edc99a109a910d04f Mon Sep 17 00:00:00 2001
From f18c5862688e3875aab0144c6d657708470175b9 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 13:46:15 +0800
Subject: [PATCH 16/31] TelephonyManager: bring back getNetworkClass()
Subject: [PATCH 16/33] TelephonyManager: bring back getNetworkClass()
This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.

View File

@@ -1,7 +1,7 @@
From 6ca147c2c8bfdaa87355f78f37572b1671994371 Mon Sep 17 00:00:00 2001
From 5a73b02dbc2b956482709865dd6e2140496a669b Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:26:45 +0800
Subject: [PATCH 17/31] TelephonyManager: add API annotations for
Subject: [PATCH 17/33] TelephonyManager: add API annotations for
setTelephonyProperty
* This method was added back by reverting commit

View File

@@ -1,7 +1,7 @@
From f98dde9d6af10f2990a0433662485eeb385f211d Mon Sep 17 00:00:00 2001
From fd7520b8edfd852c64867282e0d12f8b4cbc33b1 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com>
Date: Tue, 2 Feb 2021 10:20:51 +0000
Subject: [PATCH 18/31] Fix Wakelock issue
Subject: [PATCH 18/33] Fix Wakelock issue
Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
---

View File

@@ -1,7 +1,7 @@
From d5649f36686e27f8e94c3ebf1478bfa09d669f8f Mon Sep 17 00:00:00 2001
From 84b5f050a8fe593d4c285014c0b39dcb3b76b2af Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 20 Mar 2021 14:31:01 +0100
Subject: [PATCH 19/31] Automatically detect pick up sensor, so that an overlay
Subject: [PATCH 19/33] Automatically detect pick up sensor, so that an overlay
is required for the sole purpose of enabling pulse doze on pick up sensor
---

View File

@@ -1,7 +1,7 @@
From e484e2ece36778057bb70c446ca3ac2e5eaac98d Mon Sep 17 00:00:00 2001
From 323b26d91a1ee03a7cb5d80bf3d678b4a07d1d1c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 23 Mar 2021 19:43:26 +0100
Subject: [PATCH 20/31] Catch broken mainBuiltInDisplayCutoutRectApproximation
Subject: [PATCH 20/33] Catch broken mainBuiltInDisplayCutoutRectApproximation
Some devices (Redmi Note 9T) have:
mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout

View File

@@ -1,7 +1,7 @@
From d55afdade8ce3c1c5368929af4dd71aad3555174 Mon Sep 17 00:00:00 2001
From 82d865e76a3d19d9cc2749bc4d4ea444f526d6ca Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 24 Mar 2018 08:01:48 +0100
Subject: [PATCH 21/31] backlight: Fix backlight control on Galaxy S9(+)
Subject: [PATCH 21/33] backlight: Fix backlight control on Galaxy S9(+)
Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6

View File

@@ -1,7 +1,7 @@
From e04878670b5c3bfffd2991fa4501b08eb5516636 Mon Sep 17 00:00:00 2001
From f20085c942cc67e25ee5f14e9b4f350b03e6ef87 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 16 Oct 2021 05:27:57 -0700
Subject: [PATCH 22/31] Add support for app signature spoofing
Subject: [PATCH 22/33] Add support for app signature spoofing
This is needed by microG GmsCore to pretend to be the official Google
Play Services package, because client apps check the package signature

View File

@@ -1,7 +1,7 @@
From 94c1a67546b3487b2dea4cdc136d9d019d7192db Mon Sep 17 00:00:00 2001
From c9dbe8146db94cd49c6a7034b57dbc70bb90e46d Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 4 Sep 2021 08:26:30 +0000
Subject: [PATCH 23/31] Revert "Switch long-press power behavior in AOSP."
Subject: [PATCH 23/33] Revert "Switch long-press power behavior in AOSP."
This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
---

View File

@@ -1,7 +1,7 @@
From f029bf72a4fbb195363d841c58d55f9613335328 Mon Sep 17 00:00:00 2001
From fecdff7eb4527d68556c283bfb6fc214f0987e83 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 17 Dec 2021 17:16:14 -0500
Subject: [PATCH 24/31] Reduce the size of udfps enroll progress bar. Some
Subject: [PATCH 24/33] Reduce the size of udfps enroll progress bar. Some
devices have their udfps pretty low, and the progress bar would make the icon
at the wrong place

View File

@@ -1,7 +1,7 @@
From 7a65fc6e04b4dc686c67073eb73fe35a1c93ef90 Mon Sep 17 00:00:00 2001
From c0a26634b7f0c7803be78afda76ba35b61d6f5dc Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 19 Dec 2021 17:08:22 -0500
Subject: [PATCH 25/31] Add UDFPS support for various devices
Subject: [PATCH 25/33] Add UDFPS support for various devices
Successfully tested on Galaxy A51, Xiaomi Mi 9, and OnePlus Nord 2

View File

@@ -1,7 +1,7 @@
From 58f189bc4c81f2e45b8434e71674455ed6456553 Mon Sep 17 00:00:00 2001
From fed8b0ec9d0e831ae4ce7c4236d98576fe023148 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Dec 2021 15:01:41 -0500
Subject: [PATCH 26/31] Dynamically resize boot animation to match screen size
Subject: [PATCH 26/33] Dynamically resize boot animation to match screen size
Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
---

View File

@@ -1,7 +1,7 @@
From 7871552e0324ce0fb980d670282c163d88ec3303 Mon Sep 17 00:00:00 2001
From 7866d0de9feb99616ce229e923541bd8928d01d6 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 27 Dec 2021 17:57:11 -0500
Subject: [PATCH 27/31] Once we integrate Samsung Power hal in libpowermanager,
Subject: [PATCH 27/33] Once we integrate Samsung Power hal in libpowermanager,
libpowermanager and its deps require linking against
vendor.samsung.hardware.miscpower@2.0

View File

@@ -1,7 +1,7 @@
From 250a08142fc0bbe96622346f12dafb003fc10123 Mon Sep 17 00:00:00 2001
From 36ba1df150d83e6967e66b45d82564fae7016f5f Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 3 Mar 2022 09:15:32 -0500
Subject: [PATCH 28/31] Add persist.sys.phh.ultrasonic_udfps property to
Subject: [PATCH 28/33] Add persist.sys.phh.ultrasonic_udfps property to
disable green circle for udfps
---

View File

@@ -1,7 +1,7 @@
From 983dbb48d5f5d20c1bb53dc4b5d4afe735f680c9 Mon Sep 17 00:00:00 2001
From b704b4313ed6157ed22d134a65acd6444e5b4ac8 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 3 Mar 2022 09:17:17 -0500
Subject: [PATCH 29/31] Allow 128bits SHA1 IPSec keys. This is required to
Subject: [PATCH 29/33] Allow 128bits SHA1 IPSec keys. This is required to
implement VoLTE with this API
---

View File

@@ -1,7 +1,7 @@
From eb66d314f14eb35e10d796886fc50f3d6a0cdbc0 Mon Sep 17 00:00:00 2001
From 0d1dd110b3668b355c6da4dcbc74816786cc02ec Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 4 Mar 2022 19:26:53 -0500
Subject: [PATCH 30/31] Fix FOD on ZF8
Subject: [PATCH 30/33] Fix FOD on ZF8
Goodix HAL expects events in this order:
- Fingerprint down when touchscreen says fp down

View File

@@ -1,7 +1,7 @@
From e5999473443fc20611760aaf3098035845e7ec68 Mon Sep 17 00:00:00 2001
From d598259994a1a283acf0605f63f0891765efbe57 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 2 Apr 2022 18:04:01 -0400
Subject: [PATCH 31/31] Allow disabling of fingerprint cleanups, needed on some
Subject: [PATCH 31/33] Allow disabling of fingerprint cleanups, needed on some
Realme devices that cant enumerate
---

View File

@@ -0,0 +1,25 @@
From 779a85d010dfef34500e3f1e35513d87fedc6073 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 May 2022 18:02:25 -0400
Subject: [PATCH 32/33] Switch FOD to WHITE
---
.../src/com/android/systemui/biometrics/UdfpsSurfaceView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
index 51409b9c533a..77fad35d32d4 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java
@@ -69,7 +69,7 @@ public class UdfpsSurfaceView extends SurfaceView implements SurfaceHolder.Callb
mSensorPaint = new Paint(0 /* flags */);
mSensorPaint.setAntiAlias(true);
- mSensorPaint.setARGB(255, 0, 255, 0);
+ mSensorPaint.setARGB(255, 255, 255, 255);
mSensorPaint.setStyle(Paint.Style.FILL);
}
--
2.25.1

View File

@@ -0,0 +1,83 @@
From a0dff1c926402da7b867d7d96ce596439d94023c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 May 2022 18:02:40 -0400
Subject: [PATCH 33/33] Support samsung ultrasonic udfps
---
.../systemui/biometrics/UdfpsView.java | 4 +++-
.../sensors/fingerprint/UdfpsHelper.java | 23 +++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java
index 7b8a5995f26c..7c55faa4b094 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.java
@@ -65,7 +65,7 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin
@NonNull private final Paint mDebugTextPaint;
private final float mSensorTouchAreaCoefficient;
private final int mOnIlluminatedDelayMs;
- private final @HbmType int mHbmType;
+ private @HbmType int mHbmType;
// Only used for UdfpsHbmTypes.GLOBAL_HBM.
@Nullable private UdfpsSurfaceView mGhbmView;
@@ -151,6 +151,8 @@ public class UdfpsView extends FrameLayout implements DozeReceiver, UdfpsIllumin
SETTING_HBM_TYPE, DEFAULT_HBM_TYPE, UserHandle.USER_CURRENT);
} else {
mHbmType = DEFAULT_HBM_TYPE;
+ if(android.os.SystemProperties.getBoolean("persist.sys.phh.ultrasonic_udfps", false))
+ mHbmType = UdfpsHbmTypes.LOCAL_HBM;
}
}
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java
index e97f70d7bffd..8e99392cf545 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/UdfpsHelper.java
@@ -24,6 +24,7 @@ import android.os.RemoteException;
import android.util.Slog;
import vendor.goodix.hardware.biometrics.fingerprint.V2_1.IGoodixFingerprintDaemon;
+import vendor.samsung.hardware.biometrics.fingerprint.V3_0.ISehBiometricsFingerprint;
import java.io.PrintWriter;
@@ -59,6 +60,17 @@ public class UdfpsHelper {
}
}
+ try {
+ if("true".equals(android.os.SystemProperties.get("persist.sys.phh.ultrasonic_udfps"))) {
+ Slog.e(TAG, "trying ultrasonic samsung pressed");
+ ISehBiometricsFingerprint fp = ISehBiometricsFingerprint.getService();
+ fp.sehRequest(22 /* SEM_FINGER_STATE */, 2 /* finger pressed */, new java.util.ArrayList<Byte>(),
+ (int retval, java.util.ArrayList<Byte> out) -> {} );
+ }
+ } catch(Throwable t) {
+ Slog.e(TAG, "Tried sending Samsung command failed");
+ }
+
try {
// Asus goodix commands
IGoodixFingerprintDaemon goodixDaemon = IGoodixFingerprintDaemon.getService();
@@ -114,6 +126,17 @@ public class UdfpsHelper {
}
}
+ try {
+ if("true".equals(android.os.SystemProperties.get("persist.sys.phh.ultrasonic_udfps"))) {
+ Slog.e(TAG, "trying ultrasonic samsung released");
+ ISehBiometricsFingerprint fp = ISehBiometricsFingerprint.getService();
+ fp.sehRequest(22 /* SEM_FINGER_STATE */, 1 /* finger pressed */, new java.util.ArrayList<Byte>(),
+ (int retval, java.util.ArrayList<Byte> out) -> {} );
+ }
+ } catch(Throwable t) {
+ Slog.e(TAG, "Tried sending Samsung command failed");
+ }
+
try {
IGoodixFingerprintDaemon goodixDaemon = IGoodixFingerprintDaemon.getService();
if(android.os.SystemProperties.get("ro.vendor.build.fingerprint").contains("ASUS")) {
--
2.25.1

View File

@@ -1,8 +1,8 @@
From e5a3d5022cac5006195485aca93bc621b6a68473 Mon Sep 17 00:00:00 2001
From 61dc02d02befdac9aa545ce6908403cffddd3a9b Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 14 Aug 2018 21:48:19 +0200
Subject: [PATCH] Act as usb device when there is no hal, but we believe we are
a device
Subject: [PATCH 1/2] Act as usb device when there is no hal, but we believe we
are a device
Change-Id: I036090738525fd8cc63534d52d02ab1852950a7d
---
@@ -28,5 +28,5 @@ index c5bcbed00c..77b6148fa6 100644
UsbPortStatus portStatus = intent.getExtras()
.getParcelable(UsbManager.EXTRA_PORT_STATUS);
--
2.29.2
2.25.1

View File

@@ -0,0 +1,40 @@
From d33a798a4a8143e1fc6e78459bbcce47f32b8174 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 May 2022 17:44:28 -0400
Subject: [PATCH 2/2] Ignore cancelled fingerprint events, they are expected,
plus add more fingerprint enroll logs
---
.../biometrics/fingerprint/FingerprintEnrollEnrolling.java | 3 +++
.../biometrics/fingerprint/FingerprintEnrollFindSensor.java | 1 +
2 files changed, 4 insertions(+)
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 1a83da567c..f85666063a 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -436,6 +436,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
@Override
public void onEnrollmentError(int errMsgId, CharSequence errString) {
+ android.util.Log.e("PHH-Enroll", "heyo " + errMsgId + ", " + errString , new Exception());
+ if (errMsgId == 5) return;
+
FingerprintErrorDialog.showErrorDialog(this, errMsgId);
stopIconAnimation();
if (!mCanAssumeUdfps) {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 87ce623f9b..f0eeae2fa8 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -210,6 +210,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
@Override
public void onEnrollmentError(int errMsgId, CharSequence errString) {
+ android.util.Log.e("PHH-Enroll", "heyo " + errMsgId + ", " + errString + ", " + mNextClicked, new Exception());
if (mNextClicked && errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
mNextClicked = false;
proceedToEnrolling(false /* cancelEnrollment */);
--
2.25.1