Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd4d61826d0499d77c0501bd150b5f7395c94fd13':
  Not allowing empty fingerprint names anymore
This commit is contained in:
Selim Cinek
2015-08-17 22:43:22 +00:00
committed by Android Git Automerger
parent 73ef464291 d4d61826d0
commit a6aa1fbd2b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/fingerprint/FingerprintUtils.java
View File

@@ -19,6 +19,7 @@ package com.android.server.fingerprint;
import android.content.Context; import android.content.Context;
import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.Fingerprint;
import android.os.Vibrator; import android.os.Vibrator;
import android.text.TextUtils;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
@@ -64,6 +65,10 @@ public class FingerprintUtils {
} }
public void renameFingerprintForUser(Context ctx, int fingerId, int userId, CharSequence name) { 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); getStateForUser(ctx, userId).renameFingerprint(fingerId, name);
} }