From d9d530216f9c41444b61f917a70f7434bd1f528b Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Thu, 13 Aug 2015 16:17:13 -0700 Subject: [PATCH] Not allowing empty fingerprint names anymore Bug: 22497103 Change-Id: I638b1db5b614f5ea9bf8e3566bf4619a3249d391 --- .../com/android/server/fingerprint/FingerprintUtils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/core/java/com/android/server/fingerprint/FingerprintUtils.java b/services/core/java/com/android/server/fingerprint/FingerprintUtils.java index d2744128ab9fb..49dc8e4dac71b 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintUtils.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintUtils.java @@ -19,6 +19,7 @@ package com.android.server.fingerprint; import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.os.Vibrator; +import android.text.TextUtils; import android.util.SparseArray; import com.android.internal.annotations.GuardedBy; @@ -64,6 +65,10 @@ public class FingerprintUtils { } public void renameFingerprintForUser(Context ctx, int fingerId, int userId, CharSequence name) { + if (TextUtils.isEmpty(name)) { + // Don't do the rename if it's empty + return; + } getStateForUser(ctx, userId).renameFingerprint(fingerId, name); }