commit 9ac1d9a15cb1dc06c8cc2c068f37e94e8bb033b5
author Stanley Wang <stanleytfwang@google.com> Mon Jan 06 14:10:40 2020 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jan 06 23:27:16 2020 +0000
tree e2f268be95e6a7c0ae194365b5291c1680a67388
parent 58b42f0584c87aa1f903112f9ded14f5e86e224f

Fix Settings search crashed.

Add the check condition in the getNonIndexableKeys to
check if the FaceManager exist or not.

Fixes: 147076221
Test: manual
Change-Id: I898c936403ce90869a9da28aa14297eb6bf5d730
(cherry picked from commit e037faf8307e8850247b688b6d1feae1de207638)

src/com/android/settings/biometrics/face/FaceSettings.java

diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index e1ca4f7..08cfa70 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -329,10 +329,13 @@
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     final List<String> keys = super.getNonIndexableKeys(context);
-                    final FaceManager faceManager = context.getSystemService(FaceManager.class);
-                    final boolean hasEnrolled = faceManager.hasEnrolledTemplates(
-                            UserHandle.myUserId());
-                    keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK : PREF_KEY_DELETE_FACE_DATA);
+                    if (isAvailable(context)) {
+                        final FaceManager faceManager = context.getSystemService(FaceManager.class);
+                        final boolean hasEnrolled = faceManager.hasEnrolledTemplates(
+                                UserHandle.myUserId());
+                        keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK
+                                : PREF_KEY_DELETE_FACE_DATA);
+                    }
                     return keys;
                 }
             };