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

Prevent NPE on deleting fingerprint in Settings

Browse Source 
Gate all Settings FingerprintUnlockCategory logic on isSfps() check to prevent NPE

Fixes: 279866500
Test: Enroll 2+ fingerprints on a non-sfps device, delete fingerprint,
observe no crash

Change-Id: I040d498426e0f8efb789875eedeb7bcf44436149
This commit is contained in:
Grace Cheng
2023-04-27 18:30:38 +00:00
parent 24666c9737
commit ec1bd37db0
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -283,7 +283,9 @@ public class FingerprintSettings extends SubSettings {
case MSG_REFRESH_FINGERPRINT_TEMPLATES: case MSG_REFRESH_FINGERPRINT_TEMPLATES:
removeFingerprintPreference(msg.arg1); removeFingerprintPreference(msg.arg1);
updateAddPreference(); updateAddPreference();
updateFingerprintUnlockCategoryVisibility(); if (isSfps()) {
updateFingerprintUnlockCategoryVisibility();
}
updatePreferences(); updatePreferences();
break; break;
case MSG_FINGER_AUTH_SUCCESS: case MSG_FINGER_AUTH_SUCCESS:
@@ -494,9 +496,13 @@ public class FingerprintSettings extends SubSettings {
} }
private boolean isSfps() { private boolean isSfps() {
for (FingerprintSensorPropertiesInternal prop : mSensorProperties) { mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity());
if (prop.isAnySidefpsType()) { if (mFingerprintManager != null) {
return true; mSensorProperties = mFingerprintManager.getSensorPropertiesInternal();
for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
if (prop.isAnySidefpsType()) {
return true;
}
} }
} }
return false; return false;
@@ -838,18 +844,20 @@ public class FingerprintSettings extends SubSettings {
private List<AbstractPreferenceController> buildPreferenceControllers(Context context) { private List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
mFingerprintUnlockCategoryPreferenceController = if (isSfps()) {
mFingerprintUnlockCategoryPreferenceController =
new FingerprintUnlockCategoryController( new FingerprintUnlockCategoryController(
context, context,
KEY_FINGERPRINT_UNLOCK_CATEGORY KEY_FINGERPRINT_UNLOCK_CATEGORY
); );
mRequireScreenOnToAuthPreferenceController = mRequireScreenOnToAuthPreferenceController =
new FingerprintSettingsRequireScreenOnToAuthPreferenceController( new FingerprintSettingsRequireScreenOnToAuthPreferenceController(
context, context,
KEY_REQUIRE_SCREEN_ON_TO_AUTH KEY_REQUIRE_SCREEN_ON_TO_AUTH
); );
controllers.add(mFingerprintUnlockCategoryPreferenceController); controllers.add(mFingerprintUnlockCategoryPreferenceController);
controllers.add(mRequireScreenOnToAuthPreferenceController); controllers.add(mRequireScreenOnToAuthPreferenceController);
}
return controllers; return controllers;
} }