PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev

Browse Source 
am: eb62407114

Change-Id: I720cf3554c54cedfb674e93c552f45ab368734a9
This commit is contained in:
Kevin Chyn
2017-04-19 08:13:20 +00:00
committed by android-build-merger
parent 77fca989a0 eb62407114
commit 98a7794b13
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -47,6 +47,7 @@ import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.style.URLSpan; import android.text.style.URLSpan;
import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
@@ -604,7 +605,9 @@ public class FingerprintSettings extends SubSettings {
private void renameFingerPrint(int fingerId, String newName) { private void renameFingerPrint(int fingerId, String newName) {
mFingerprintManager.rename(fingerId, mUserId, newName); mFingerprintManager.rename(fingerId, mUserId, newName);
if (!TextUtils.isEmpty(newName)) {
mFingerprintsRenaming.put(fingerId, newName); mFingerprintsRenaming.put(fingerId, newName);
}
updatePreferences(); updatePreferences();
} }