commit ef963fe0790df75e2a02c48ff69db8040da3ea8f
author Kevin Chyn <kchyn@google.com> Wed Jun 02 20:03:38 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 02 20:03:38 2021 +0000
tree e9ef8cc171478f1cb816dcf2780d2d511295f8c7
parent 6c0a701540ee3f4caa0450e58420e46ca74a54d7
parent 3d20bf93fde055c5128bd71b28a0f40144d2800c

Merge "Fix array out of bounds in BiometricEnrollActivity" into sc-dev

src/com/android/settings/biometrics/BiometricEnrollActivity.java

diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index 4702fed..11313fd 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -266,10 +266,12 @@
                 faceManager.getSensorPropertiesInternal();
 
         // This would need to be updated for devices with multiple sensors of the same modality
-        mIsFaceEnrollable = faceManager.getEnrolledFaces(mUserId).size()
-                < faceProperties.get(0).maxEnrollmentsPerUser;
-        mIsFingerprintEnrollable = fingerprintManager.getEnrolledFingerprints(mUserId).size()
-                < fpProperties.get(0).maxEnrollmentsPerUser;
+        mIsFaceEnrollable = !faceProperties.isEmpty() &&
+                faceManager.getEnrolledFaces(mUserId).size()
+                        < faceProperties.get(0).maxEnrollmentsPerUser;
+        mIsFingerprintEnrollable = !fpProperties.isEmpty() &&
+                fingerprintManager.getEnrolledFingerprints(mUserId).size()
+                        < fpProperties.get(0).maxEnrollmentsPerUser;
 
         if (!mConfirmingCredentials) {
             mConfirmingCredentials = true;