commit 71adc974913cbcd1466edb78b847b861f6b13aa0
author Jim Miller <jaggies@google.com> Wed Jul 22 20:01:52 2015 -0700
committer Jim Miller <jaggies@google.com> Wed Jul 22 20:01:52 2015 -0700
tree 019b02fc7f6fd967365b55e64af4719edb5f75f2
parent f8598212f00f7c8c300add944343b67ae97b1d76

Add FEATURE_FINGERPRINT to PackageManager's feature list

Fixes bug 22674557

Change-Id: Ib35cd49c884a536a7147c57cb06bea00efd59c03

tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java

diff --git a/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java b/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
index dc03b38..95704b9 100644
--- a/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
+++ b/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
@@ -55,12 +55,11 @@
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        // TODO: pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
-        // PackageManager pm = getContext().getPackageManager();
-        mHasFingerprintManager = true;
         mAuthState = AuthState.AUTH_UNKNOWN;
 
-        if (mHasFingerprintManager) {
+        PackageManager pm = getContext().getPackageManager();
+        if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+            mHasFingerprintManager = true;
             mFingerprintManager = (FingerprintManager)
                     getContext().getSystemService(Context.FINGERPRINT_SERVICE);
         }