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

Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev

Browse Source 
am: b8aaaf82a2

Change-Id: Ieb50e09eebe645de8d3aca58718cf3ee504edb80
This commit is contained in:
Jim Miller
2017-04-07 04:51:09 +00:00
committed by android-build-merger
parent 64c8244524 b8aaaf82a2
commit 9e6345e1b9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -360,6 +360,8 @@ public class FingerprintSettings extends SubSettings {
} }
private void updateAddPreference() { private void updateAddPreference() {
if (getActivity() == null) return; // Activity went away
/* 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);