From eac5a80775b683eb4da5b45cfcb053f662d9678f Mon Sep 17 00:00:00 2001
From: Wei Liu <luciferleo@google.com>
Date: Wed, 3 Feb 2016 14:31:37 -0800
Subject: [PATCH] DO NOT MERGE ANYWHERE Start the FingnerprintService only if
 it has FEATURE_FINGERPRINT.

b/26877020

Change-Id: Idfef31edb7e67ae60c1b2205df326ed1c5657618
(cherry picked from commit aae35640cd4e08186c01875e8d14962258e3d365)
---
 services/java/com/android/server/SystemServer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index b64db578decbc..319eb2d3087c1 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1088,7 +1088,9 @@ public final class SystemServer {
 
                 mSystemServiceManager.startService(TrustManagerService.class);
 
-                mSystemServiceManager.startService(FingerprintService.class);
+                if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+                    mSystemServiceManager.startService(FingerprintService.class);
+                }
 
                 traceBeginAndSlog("StartBackgroundDexOptService");
                 try {