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

Commit 98a7794b authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev 

am: eb624071

Change-Id: I720cf3554c54cedfb674e93c552f45ab368734a9
parents 77fca989 eb624071

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

+4 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.text.SpannableString; 
import android.text.SpannableStringBuilder;

import android.text.TextPaint;

import android.text.style.URLSpan;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.Log;

import android.view.View;
@@ -604,7 +605,9 @@ public class FingerprintSettings extends SubSettings { 


        private void renameFingerPrint(int fingerId, String newName) {

            mFingerprintManager.rename(fingerId, mUserId, newName);

            if (!TextUtils.isEmpty(newName)) {

                mFingerprintsRenaming.put(fingerId, newName);

            }

            updatePreferences();

        }