PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Settings search crashed.

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

Fixes: 147076221
Test: manual
Change-Id: I898c936403ce90869a9da28aa14297eb6bf5d730
This commit is contained in:
Stanley Wang
2020-01-06 14:10:40 +08:00
parent 8b47bd8665
commit e037faf830
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -329,10 +329,13 @@ public class FaceSettings extends DashboardFragment {
@Override @Override
public List<String> getNonIndexableKeys(Context context) { public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context); final List<String> keys = super.getNonIndexableKeys(context);
final FaceManager faceManager = context.getSystemService(FaceManager.class); if (isAvailable(context)) {
final boolean hasEnrolled = faceManager.hasEnrolledTemplates( final FaceManager faceManager = context.getSystemService(FaceManager.class);
UserHandle.myUserId()); final boolean hasEnrolled = faceManager.hasEnrolledTemplates(
keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK : PREF_KEY_DELETE_FACE_DATA); UserHandle.myUserId());
keys.add(hasEnrolled ? PREF_KEY_ENROLL_FACE_UNLOCK
: PREF_KEY_DELETE_FACE_DATA);
}
return keys; return keys;
} }
}; };