commit b8aaaf82a28eaba969f89cac81192d0f2c51fc4e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 07 04:47:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 07 04:47:59 2017 +0000
tree 652d5c933dcf47108bbbd08eab3f012e68acde4f
parent 65682e7fa5df7d4ac3a3a04b6a89b25356a70c8a
parent d5a3c5373315e1eefe0f0312aa19007313461634

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

src/com/android/settings/fingerprint/FingerprintSettings.java

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