From e8ed0445472f7f1f32c4f713d8e4d115230b92a5 Mon Sep 17 00:00:00 2001
From: eddielan <eddielan@google.com>
Date: Tue, 15 Oct 2019 11:41:28 +0800
Subject: [PATCH] fingerprint: Enable to build fingerprint

Bug: 142628006
Test: Build Pass
Change-Id: I43d20c9671f8e20f9e3cebab9328f61e02571f80
---
 device-sunfish.mk | 3 +++
 fingerprint.mk    | 7 +++++++
 uinput-fpc.idc    | 3 +--
 uinput-fpc.kl     | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 fingerprint.mk

diff --git a/device-sunfish.mk b/device-sunfish.mk
index 6817f3b0..3f8039ce 100644
--- a/device-sunfish.mk
+++ b/device-sunfish.mk
@@ -35,3 +35,6 @@ PRODUCT_COPY_FILES += \
     frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml
+
+# Fingerprint HIDL
+include device/google/sunfish/fingerprint.mk
diff --git a/fingerprint.mk b/fingerprint.mk
new file mode 100644
index 00000000..1de30249
--- /dev/null
+++ b/fingerprint.mk
@@ -0,0 +1,7 @@
+# Fingerprint
+PRODUCT_PACKAGES += \
+    android.hardware.biometrics.fingerprint@2.1-service.fpc \
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
+    $(LOCAL_PATH)/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc
diff --git a/uinput-fpc.idc b/uinput-fpc.idc
index 526d0e8c..b1786edb 100644
--- a/uinput-fpc.idc
+++ b/uinput-fpc.idc
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The Android Open Source Project
+# Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,4 +17,3 @@
 #
 keyboard.orientationAware = 1
 keyboard.builtIn = 1
-
diff --git a/uinput-fpc.kl b/uinput-fpc.kl
index c8f0acd3..2bc2054d 100644
--- a/uinput-fpc.kl
+++ b/uinput-fpc.kl
@@ -1,4 +1,4 @@
-key 106   SYSTEM_NAVIGATION_LEFT
+key 105   SYSTEM_NAVIGATION_LEFT
 key 108   SYSTEM_NAVIGATION_DOWN
 key 103   SYSTEM_NAVIGATION_UP
-key 105   SYSTEM_NAVIGATION_RIGHT
+key 106   SYSTEM_NAVIGATION_RIGHT