From d93a5f853e3336a301ab2efaa153327049338cd1 Mon Sep 17 00:00:00 2001
From: Volodymyr Zhdanov <wight554@gmail.com>
Date: Fri, 23 Oct 2020 10:48:52 +0300
Subject: [PATCH] sm6250-common: biometrics: Rebrand to Xiaomi SM6250

Change-Id: Ia70786f28372e49cc3dc3d25fedbbe3a1562b5a7
---
 biometrics/Android.bp                         |  5 ++--
 biometrics/BiometricsFingerprint.cpp          |  2 +-
 ...s.fingerprint@2.1-service.xiaomi_atoll.rc} |  2 +-
 ...s.fingerprint@2.1-service.xiaomi_atoll.xml | 26 +++++++++++++++++++
 biometrics/service.cpp                        |  2 +-
 sepolicy/vendor/file_contexts                 |  2 ++
 6 files changed, 34 insertions(+), 5 deletions(-)
 rename biometrics/{android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998.rc => android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.rc} (92%)
 create mode 100644 biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.xml
 create mode 100644 sepolicy/vendor/file_contexts

diff --git a/biometrics/Android.bp b/biometrics/Android.bp
index 322bd4e..b5a85e7 100644
--- a/biometrics/Android.bp
+++ b/biometrics/Android.bp
@@ -14,10 +14,11 @@
 // limitations under the License.
 
 cc_binary {
-    name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998",
+    name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll",
     relative_install_path: "hw",
     defaults: ["hidl_defaults"],
-    init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998.rc"],
+    init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.rc"],
+    vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.xml"],
     srcs: ["service.cpp", "BiometricsFingerprint.cpp"],
     shared_libs: [
         "libbase",
diff --git a/biometrics/BiometricsFingerprint.cpp b/biometrics/BiometricsFingerprint.cpp
index a252dae..5da3988 100644
--- a/biometrics/BiometricsFingerprint.cpp
+++ b/biometrics/BiometricsFingerprint.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998"
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll"
 
 #include <hardware/hw_auth_token.h>
 
diff --git a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998.rc b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.rc
similarity index 92%
rename from biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998.rc
rename to biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.rc
index 812ea46..7efe889 100644
--- a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998.rc
+++ b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.rc
@@ -1,4 +1,4 @@
-service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998
+service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll
     class late_start
     user system
     group system input uhid
diff --git a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.xml b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.xml
new file mode 100644
index 0000000..70b1bd8
--- /dev/null
+++ b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll.xml
@@ -0,0 +1,26 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IBiometricsFingerprint</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IGoodixFingerprintDaemon</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IGoodixFingerprintDaemonExt</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@2.1::IGoodixFingerprintDaemon/default</fqname>
+        <fqname>@2.1::IGoodixFingerprintDaemonExt/default</fqname>
+    </hal>
+</manifest>
diff --git a/biometrics/service.cpp b/biometrics/service.cpp
index e8536ef..821d091 100644
--- a/biometrics/service.cpp
+++ b/biometrics/service.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_msm8998"
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_atoll"
 
 #include <android/log.h>
 #include <hidl/HidlTransportSupport.h>
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
new file mode 100644
index 0000000..96f1b33
--- /dev/null
+++ b/sepolicy/vendor/file_contexts
@@ -0,0 +1,2 @@
+# Fingerprint
+/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2.1-service\.xiaomi_atoll                      u:object_r:hal_fingerprint_default_exec:s0