Update Fingerprint references in Settings
Bug: 110387294
Test: builds
Change-Id: Iac9647949b7e51229cc0bb391ee83a641e0bfcdc
diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
index ce679b6..381b8eb 100644
--- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
@@ -121,7 +121,7 @@
}
final boolean isRemovingFingerprint(int fid) {
- return inProgress() && mFingerprintRemoving.getFingerId() == fid;
+ return inProgress() && mFingerprintRemoving.getBiometricId() == fid;
}
final boolean inProgress() {
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 880ca62..0bd926d 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -161,7 +161,7 @@
@Override
public void onAuthenticationSucceeded(
FingerprintManager.AuthenticationResult result) {
- int fingerId = result.getFingerprint().getFingerId();
+ int fingerId = result.getFingerprint().getBiometricId();
mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
}
@@ -187,7 +187,7 @@
new FingerprintRemoveSidecar.Listener() {
public void onRemovalSucceeded(Fingerprint fingerprint) {
mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
- fingerprint.getFingerId(), 0).sendToTarget();
+ fingerprint.getBiometricId(), 0).sendToTarget();
updateDialog();
}
@@ -393,16 +393,16 @@
final Fingerprint item = items.get(i);
FingerprintPreference pref = new FingerprintPreference(root.getContext(),
this /* onDeleteClickListener */);
- pref.setKey(genKey(item.getFingerId()));
+ pref.setKey(genKey(item.getBiometricId()));
pref.setTitle(item.getName());
pref.setFingerprint(item);
pref.setPersistent(false);
pref.setIcon(R.drawable.ic_fingerprint_24dp);
- if (mRemovalSidecar.isRemovingFingerprint(item.getFingerId())) {
+ if (mRemovalSidecar.isRemovingFingerprint(item.getBiometricId())) {
pref.setEnabled(false);
}
- if (mFingerprintsRenaming.containsKey(item.getFingerId())) {
- pref.setTitle(mFingerprintsRenaming.get(item.getFingerId()));
+ if (mFingerprintsRenaming.containsKey(item.getBiometricId())) {
+ pref.setTitle(mFingerprintsRenaming.get(item.getBiometricId()));
}
root.addPreference(pref);
pref.setOnPreferenceChangeListener(this);
@@ -522,9 +522,9 @@
private void showRenameDialog(final Fingerprint fp) {
RenameDialog renameDialog = new RenameDialog();
Bundle args = new Bundle();
- if (mFingerprintsRenaming.containsKey(fp.getFingerId())) {
- final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getFingerId()),
- fp.getGroupId(), fp.getFingerId(), fp.getDeviceId());
+ if (mFingerprintsRenaming.containsKey(fp.getBiometricId())) {
+ final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getBiometricId()),
+ fp.getGroupId(), fp.getBiometricId(), fp.getDeviceId());
args.putParcelable("fingerprint", f);
} else {
args.putParcelable("fingerprint", fp);
@@ -648,7 +648,7 @@
@VisibleForTesting
void deleteFingerPrint(Fingerprint fingerPrint) {
mRemovalSidecar.startRemove(fingerPrint, mUserId);
- String name = genKey(fingerPrint.getFingerId());
+ String name = genKey(fingerPrint.getBiometricId());
Preference prefToRemove = findPreference(name);
prefToRemove.setEnabled(false);
updateAddPreference();
@@ -711,7 +711,7 @@
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
- final int fingerprintId = mFp.getFingerId();
+ final int fingerprintId = mFp.getBiometricId();
Log.v(TAG, "Removing fpId=" + fingerprintId);
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_FINGERPRINT_DELETE,
@@ -760,11 +760,11 @@
Log.d(TAG, "rename " + name + " to " + newName);
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_FINGERPRINT_RENAME,
- mFp.getFingerId());
+ mFp.getBiometricId());
FingerprintSettingsFragment parent
= (FingerprintSettingsFragment)
getTargetFragment();
- parent.renameFingerPrint(mFp.getFingerId(),
+ parent.renameFingerPrint(mFp.getBiometricId(),
newName);
}
dialog.dismiss();
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 1dc8baa..b5fb8e9 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -682,7 +682,7 @@
CharSequence errString) {
Log.e(TAG, String.format(
"Can't remove fingerprint %d in group %d. Reason: %s",
- fp.getFingerId(), fp.getGroupId(), errString));
+ fp.getBiometricId(), fp.getGroupId(), errString));
// TODO: need to proceed with the removal of managed profile
// fingerprints and finish() gracefully.
}