| commit | fc275db6f63b4e5f76306df25a3e39ed599e70f9 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Apr 07 04:55:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 07 04:55:39 2017 +0000 |
| tree | bf47c830e1faa963182030b7f92794993b6fae2a | |
| parent | d4bfa472a85ba709f072c6fef3b159360321ebc4 [diff] | |
| parent | 9e6345e1b9871accd40c0d413a04b460942e70bb [diff] |
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev am: b8aaaf82a2 am: 9e6345e1b9 Change-Id: I99c343a6f5dc1e7040d154ad19628cc5777544f5
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);