DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.

b/26877020 Change-Id: Idfef31edb7e67ae60c1b2205df326ed1c5657618 (cherry picked from commit aae35640cd)
2016-02-03 14:31:37 -08:00
parent 37c80bc984
commit eac5a80775
1 changed files with 3 additions and 1 deletions
--- 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 {