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

Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I6fe18e9aba304628a45c48eb58e2b234053ff072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2023-04-21 08:13:08 +00:00
committed by Automerger Merge Worker
parent 55110e699e a958fc79c8
commit cb8fea4125
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -593,10 +593,16 @@ public class FingerprintSettings extends SubSettings {
} }
private void updateAddPreference() { private void updateAddPreference() {
if (getActivity() == null) return; // Activity went away if (getActivity() == null) {
return; // Activity went away
}
final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD); final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
if (addPreference == null) {
return; // b/275519315 Skip if updateAddPreference() invoke before addPreference()
}
/* Disable preference if too many fingerprints added */ /* Disable preference if too many fingerprints added */
final int max = getContext().getResources().getInteger( final int max = getContext().getResources().getInteger(
com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser); com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);