Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
eb62407114
@@ -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);
|
||||
mFingerprintsRenaming.put(fingerId, newName);
|
||||
if (!TextUtils.isEmpty(newName)) {
|
||||
mFingerprintsRenaming.put(fingerId, newName);
|
||||
}
|
||||
updatePreferences();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user