am efdb9f7b: am 514fa3c0: am a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev

* commit 'efdb9f7be8c5303cb55e75006f82c466301b1354':
  Not allowing empty fingerprint names anymore
This commit is contained in:
Selim Cinek
2015-08-17 23:10:56 +00:00
committed by Android Git Automerger

View File

@@ -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);
}