commit 359a5df8effd592757529b5c9a2b10ba2c708b94
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Dec 15 01:50:59 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 15 01:50:59 2018 +0000
tree 0d183b39f968834464e9c30623d32692eb8fcc84
parent a40cd9c8d7193ddfff847443d959815a34a022b6
parent 7798cbecfc6371a179f8d25a9543cfe76f8a3aa3

Merge "Add fingerprint CTS test"

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 f11b6bc..ec8e634 100644
--- a/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
+++ b/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
@@ -67,6 +67,18 @@
     }
 
     @Presubmit
+    public void test_managerAndFeature() {
+        final boolean hasFingerprintFeature = getContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+        final FingerprintManager fpm = getContext().getSystemService(FingerprintManager.class);
+
+        if (hasFingerprintFeature || fpm != null) {
+            assertTrue(hasFingerprintFeature);
+            assertTrue(fpm != null);
+        }
+    }
+
+    @Presubmit
     public void test_hasFingerprintHardware() {
         if (!mHasFingerprintManager) {
             return; // skip test if no fingerprint feature