commit eb62407114d82484e7cd33520974d41f8a734cd0
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 19 08:07:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 19 08:07:54 2017 +0000
tree 0e27ffa9ca73a1ba0241f3482b55554802a5fa30
parent d2561263a8632778122b36f6830a34604f2084a2
parent 814079f27f90ce96f6316ac07781ce459f1535d7

Merge "FP name shouldn't be allowed to allow/display non-null names" 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 01670fe..fb59c59 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -47,6 +47,7 @@
 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 @@
 
         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();
         }