From 173559b256d0da5b1b4dcbc35d4e59e292cd8425 Mon Sep 17 00:00:00 2001
From: Pig <pig.priv@gmail.com>
Date: Wed, 20 May 2020 02:11:58 +0200
Subject: [PATCH] sm6250-common: fingerprint: Clean up duplicated includes

 * Move all includes to header.

Change-Id: I36b26dcf16c8b51958129707242cafa712a17bf1
---
 fingerprint/BiometricsFingerprint.cpp |  9 ---------
 fingerprint/BiometricsFingerprint.h   | 11 ++++++++++-
 fingerprint/service.cpp               |  5 -----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/fingerprint/BiometricsFingerprint.cpp b/fingerprint/BiometricsFingerprint.cpp
index 94acdba..5db126e 100644
--- a/fingerprint/BiometricsFingerprint.cpp
+++ b/fingerprint/BiometricsFingerprint.cpp
@@ -14,18 +14,9 @@
  * 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_sm6250"
 
-#include <hardware/hw_auth_token.h>
-
-#include <hardware/hardware.h>
-#include <hardware/fingerprint.h>
 #include "BiometricsFingerprint.h"
 
-#include <cutils/properties.h>
-#include <inttypes.h>
-#include <unistd.h>
-
 namespace android {
 namespace hardware {
 namespace biometrics {
diff --git a/fingerprint/BiometricsFingerprint.h b/fingerprint/BiometricsFingerprint.h
index 6d64e3d..d8342a2 100644
--- a/fingerprint/BiometricsFingerprint.h
+++ b/fingerprint/BiometricsFingerprint.h
@@ -17,12 +17,20 @@
 #ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 
-#include <log/log.h>
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250"
+
 #include <android/log.h>
+#include <cutils/properties.h>
 #include <hardware/hardware.h>
 #include <hardware/fingerprint.h>
+#include <hardware/hw_auth_token.h>
+#include <hidl/HidlTransportSupport.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
+#include <inttypes.h>
+#include <log/log.h>
+#include <unistd.h>
+
 #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
 
 namespace android {
@@ -40,6 +48,7 @@ using ::android::hardware::Void;
 using ::android::hardware::hidl_vec;
 using ::android::hardware::hidl_string;
 using ::android::sp;
+using ::android::status_t;
 
 struct BiometricsFingerprint : public IBiometricsFingerprint {
 public:
diff --git a/fingerprint/service.cpp b/fingerprint/service.cpp
index 860a1c7..963aa29 100644
--- a/fingerprint/service.cpp
+++ b/fingerprint/service.cpp
@@ -14,11 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250"
-
-#include <android/log.h>
-#include <hidl/HidlTransportSupport.h>
-
 #include "BiometricsFingerprint.h"
 
 // libhwbinder: