Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc275db6 authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

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

am: 9e6345e1

Change-Id: I99c343a6f5dc1e7040d154ad19628cc5777544f5
parents d4bfa472 9e6345e1

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

+2 −0
Original line number Diff line number Diff line
@@ -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);