commit cf97f0b64350c3d34ecc705a7de0bca9b827d171
author Fan Zhang <zhfan@google.com> Fri Jan 05 11:18:44 2018 -0800
committer Fan Zhang <zhfan@google.com> Fri Jan 05 15:45:53 2018 -0800
tree 3537767f5b1a20f3de12a026ae088b919b3af9b6
parent 361e55bb4c0321230499d11a8017df735052c32f

Add tests for some security setting controllers

Bug: 32953042
Test: robotests
Change-Id: Ieab4e6434bbb80313f6d1b25ff1cdea5713038f0

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 6b0a5b8..cd64799 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1222,7 +1222,7 @@
 
     public static FingerprintManager getFingerprintManagerOrNull(Context context) {
         if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
-            return context.getSystemService(FingerprintManager.class);
+            return (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
         } else {
             return null;
         }