diff options
author | Selim Cinek <cinek@google.com> | 2015-08-17 22:34:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-17 22:34:40 +0000 |
commit | d4d61826d0499d77c0501bd150b5f7395c94fd13 (patch) | |
tree | 5e7e993586538a73171d786c67fbfb812eb04bab /services/core/java/com/android/server/fingerprint | |
parent | 581fd0fb2ecbd6d9ee049bb08f395ec04709eb74 (diff) | |
parent | d9d530216f9c41444b61f917a70f7434bd1f528b (diff) | |
download | frameworks_base-d4d61826d0499d77c0501bd150b5f7395c94fd13.zip frameworks_base-d4d61826d0499d77c0501bd150b5f7395c94fd13.tar.gz frameworks_base-d4d61826d0499d77c0501bd150b5f7395c94fd13.tar.bz2 |
Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev
Diffstat (limited to 'services/core/java/com/android/server/fingerprint')
-rw-r--r-- | services/core/java/com/android/server/fingerprint/FingerprintUtils.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintUtils.java b/services/core/java/com/android/server/fingerprint/FingerprintUtils.java index d274412..49dc8e4 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); } |