Merge "Return correct error when HW there is no biometric hardware"

2018-11-09 04:42:35 +00:00
parent c578d38eb7 e739daf2e8
commit a85b4a2d29
3 changed files with 34 additions and 8 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1627,7 +1627,7 @@ public final class SystemServer {

            if (hasFeatureFace || hasFeatureIris || hasFeatureFingerprint) {
                // Start this service after all biometric services.
-                traceBeginAndSlog("StartBiometricPromptService");
+                traceBeginAndSlog("StartBiometricService");
                mSystemServiceManager.startService(BiometricService.class);
                traceEnd();
            }