[fingerprint] use sailfish-devicelock-fpd, add fingerprint config, ad…

…d fingerprint wait service. JB#44327 The wait service is required to avoid issues with: sonyxperiadev/vendor-sony-oss-fingerprint@375934d
mer-hybris · Jun 3, 2019 · 5eb9567 · 5eb9567
1 parent e3dcfc7
commit 5eb9567
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+../fingerprint-wait.service
diff --git a/sparse/usr/bin/droid/fingerprint-wait.sh 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
+