Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev

2016-02-04 18:01:45 +00:00
parent 94d9f3c788 aae35640cd
commit fbd88d132e
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
@@ -979,7 +979,9 @@ public final class SystemServer {

                mSystemServiceManager.startService(TrustManagerService.class);

-                mSystemServiceManager.startService(FingerprintService.class);
+                if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+                    mSystemServiceManager.startService(FingerprintService.class);
+                }

                try {
                    Slog.i(TAG, "BackgroundDexOptService");