| commit | 9e6345e1b9871accd40c0d413a04b460942e70bb | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Apr 07 04:51:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 07 04:51:09 2017 +0000 |
| tree | ade3a554da6a3577fb2a9a3bfd4109381b28f933 | |
| parent | 64c82445241321dfcdbbd4499c128a0bb63b4e90 [diff] | |
| parent | b8aaaf82a28eaba969f89cac81192d0f2c51fc4e [diff] |
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev am: b8aaaf82a2 Change-Id: Ieb50e09eebe645de8d3aca58718cf3ee504edb80
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index 0f48f8c..dc6616a 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -360,6 +360,8 @@ } private void updateAddPreference() { + if (getActivity() == null) return; // Activity went away + /* Disable preference if too many fingerprints added */ final int max = getContext().getResources().getInteger( com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);