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

am: 9e6345e1b9 Change-Id: I99c343a6f5dc1e7040d154ad19628cc5777544f5
2017-04-07 04:55:39 +00:00
parent d4bfa472a8 9e6345e1b9
commit fc275db6f6
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -360,6 +360,8 @@ public class FingerprintSettings extends SubSettings {
        }

        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);