From 5eb95677ff5dcf198af882cd09322289d6a289ed Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Mon, 3 Jun 2019 11:48:55 +0300
Subject: [PATCH] [fingerprint] use sailfish-devicelock-fpd, add fingerprint
 config, add fingerprint wait service. JB#44327

The wait service is required to avoid issues with: https://github.com/sonyxperiadev/vendor-sony-oss-fingerprint/commit/375934d2edb2f70f57c9ec438b8e2f2ecbff2094
---
 patterns/jolla-hw-adaptation-discovery.yaml    |  2 +-
 patterns/jolla-hw-adaptation-pioneer.yaml      |  2 +-
 patterns/jolla-hw-adaptation-voyager.yaml      |  2 +-
 sparse/etc/sailfish-fpd/50-settings-nile.ini   | 13 +++++++++++++
 .../systemd/system/fingerprint-wait.service    | 18 ++++++++++++++++++
 .../fingerprint-wait.service                   |  1 +
 sparse/usr/bin/droid/fingerprint-wait.sh       |  9 +++++++++
 7 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 sparse/etc/sailfish-fpd/50-settings-nile.ini
 create mode 100644 sparse/lib/systemd/system/fingerprint-wait.service
 create mode 120000 sparse/lib/systemd/system/multi-user.target.wants/fingerprint-wait.service
 create mode 100755 sparse/usr/bin/droid/fingerprint-wait.sh

diff --git a/patterns/jolla-hw-adaptation-discovery.yaml b/patterns/jolla-hw-adaptation-discovery.yaml
index 51959c2..3748395 100644
--- a/patterns/jolla-hw-adaptation-discovery.yaml
+++ b/patterns/jolla-hw-adaptation-discovery.yaml
@@ -63,7 +63,7 @@ Requires:
 - rfkill
 
 # enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
+- sailfish-devicelock-fpd
 
 # For GPS
 - geoclue-provider-hybris
diff --git a/patterns/jolla-hw-adaptation-pioneer.yaml b/patterns/jolla-hw-adaptation-pioneer.yaml
index 08fc809..2926600 100644
--- a/patterns/jolla-hw-adaptation-pioneer.yaml
+++ b/patterns/jolla-hw-adaptation-pioneer.yaml
@@ -63,7 +63,7 @@ Requires:
 - rfkill
 
 # enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
+- sailfish-devicelock-fpd
 
 # For GPS
 - geoclue-provider-hybris
diff --git a/patterns/jolla-hw-adaptation-voyager.yaml b/patterns/jolla-hw-adaptation-voyager.yaml
index 6e6258b..dd6f7c0 100644
--- a/patterns/jolla-hw-adaptation-voyager.yaml
+++ b/patterns/jolla-hw-adaptation-voyager.yaml
@@ -63,7 +63,7 @@ Requires:
 - rfkill
 
 # enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
+- sailfish-devicelock-fpd
 
 # For GPS
 - geoclue-provider-hybris
diff --git a/sparse/etc/sailfish-fpd/50-settings-nile.ini b/sparse/etc/sailfish-fpd/50-settings-nile.ini
new file mode 100644
index 0000000..fd73668
--- /dev/null
+++ b/sparse/etc/sailfish-fpd/50-settings-nile.ini
@@ -0,0 +1,13 @@
+[fpslave]
+template_directory_owner_quirk  = system
+template_directory_group_quirk  = system
+template_directory_mode_quirk   = 0770
+
+fphal_max_fingerprints_quirk    = 5
+
+mass_remove_single_notify_quirk = 0
+set_active_group_twice_quirk    = 0
+skip_post_enroll_quirk          = 0
+skip_enumerate_quirk            = 1
+no_cancel_notification_quirk    = 0
+
diff --git a/sparse/lib/systemd/system/fingerprint-wait.service b/sparse/lib/systemd/system/fingerprint-wait.service
new file mode 100644
index 0000000..7c1112e
--- /dev/null
+++ b/sparse/lib/systemd/system/fingerprint-wait.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Wait for fingerprint
+DefaultDependencies=no
+Requires=dbus.socket
+After=dbus.socket
+After=local-fs.target
+After=droid-hal-init.service
+After=droid-late-start.service
+Before=sailfish-fpd.service
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh /usr/bin/droid/fingerprint-wait.sh
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/sparse/lib/systemd/system/multi-user.target.wants/fingerprint-wait.service b/sparse/lib/systemd/system/multi-user.target.wants/fingerprint-wait.service
new file mode 120000
index 0000000..47cdbed
--- /dev/null
+++ b/sparse/lib/systemd/system/multi-user.target.wants/fingerprint-wait.service
@@ -0,0 +1 @@
+../fingerprint-wait.service
\ No newline at end of file
diff --git a/sparse/usr/bin/droid/fingerprint-wait.sh b/sparse/usr/bin/droid/fingerprint-wait.sh
new file mode 100755
index 0000000..7008b4e
--- /dev/null
+++ b/sparse/usr/bin/droid/fingerprint-wait.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+while [ "$(getprop sys.boot_completed)" != "1" ]; do
+    echo "Waiting for boot complete"
+    sleep 1
+done
+
+sleep 1
+