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

Update Fingerprint references in Settings

Browse Source 
Bug: 110387294

Test: builds
Change-Id: Iac9647949b7e51229cc0bb391ee83a641e0bfcdc
This commit is contained in:
Kevin Chyn
2018-06-19 21:34:44 -07:00
parent 948a028690
commit fde790bf2c
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
View File

@@ -121,7 +121,7 @@ public class FingerprintRemoveSidecar extends InstrumentedFragment {
} }
final boolean isRemovingFingerprint(int fid) { final boolean isRemovingFingerprint(int fid) {
return inProgress() && mFingerprintRemoving.getFingerId() == fid; return inProgress() && mFingerprintRemoving.getBiometricId() == fid;
} }
final boolean inProgress() { final boolean inProgress() {

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

@@ -161,7 +161,7 @@ public class FingerprintSettings extends SubSettings {
@Override @Override
public void onAuthenticationSucceeded( public void onAuthenticationSucceeded(
FingerprintManager.AuthenticationResult result) { FingerprintManager.AuthenticationResult result) {
int fingerId = result.getFingerprint().getFingerId(); int fingerId = result.getFingerprint().getBiometricId();
mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget(); mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
} }
@@ -187,7 +187,7 @@ public class FingerprintSettings extends SubSettings {
new FingerprintRemoveSidecar.Listener() { new FingerprintRemoveSidecar.Listener() {
public void onRemovalSucceeded(Fingerprint fingerprint) { public void onRemovalSucceeded(Fingerprint fingerprint) {
mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES, mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
fingerprint.getFingerId(), 0).sendToTarget(); fingerprint.getBiometricId(), 0).sendToTarget();
updateDialog(); updateDialog();
} }
@@ -393,16 +393,16 @@ public class FingerprintSettings extends SubSettings {
final Fingerprint item = items.get(i); final Fingerprint item = items.get(i);
FingerprintPreference pref = new FingerprintPreference(root.getContext(), FingerprintPreference pref = new FingerprintPreference(root.getContext(),
this /* onDeleteClickListener */); this /* onDeleteClickListener */);
pref.setKey(genKey(item.getFingerId())); pref.setKey(genKey(item.getBiometricId()));
pref.setTitle(item.getName()); pref.setTitle(item.getName());
pref.setFingerprint(item); pref.setFingerprint(item);
pref.setPersistent(false); pref.setPersistent(false);
pref.setIcon(R.drawable.ic_fingerprint_24dp); pref.setIcon(R.drawable.ic_fingerprint_24dp);
if (mRemovalSidecar.isRemovingFingerprint(item.getFingerId())) { if (mRemovalSidecar.isRemovingFingerprint(item.getBiometricId())) {
pref.setEnabled(false); pref.setEnabled(false);
} }
if (mFingerprintsRenaming.containsKey(item.getFingerId())) { if (mFingerprintsRenaming.containsKey(item.getBiometricId())) {
pref.setTitle(mFingerprintsRenaming.get(item.getFingerId())); pref.setTitle(mFingerprintsRenaming.get(item.getBiometricId()));
} }
root.addPreference(pref); root.addPreference(pref);
pref.setOnPreferenceChangeListener(this); pref.setOnPreferenceChangeListener(this);
@@ -522,9 +522,9 @@ public class FingerprintSettings extends SubSettings {
private void showRenameDialog(final Fingerprint fp) { private void showRenameDialog(final Fingerprint fp) {
RenameDialog renameDialog = new RenameDialog(); RenameDialog renameDialog = new RenameDialog();
Bundle args = new Bundle(); Bundle args = new Bundle();
if (mFingerprintsRenaming.containsKey(fp.getFingerId())) { if (mFingerprintsRenaming.containsKey(fp.getBiometricId())) {
final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getFingerId()), final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getBiometricId()),
fp.getGroupId(), fp.getFingerId(), fp.getDeviceId()); fp.getGroupId(), fp.getBiometricId(), fp.getDeviceId());
args.putParcelable("fingerprint", f); args.putParcelable("fingerprint", f);
} else { } else {
args.putParcelable("fingerprint", fp); args.putParcelable("fingerprint", fp);
@@ -648,7 +648,7 @@ public class FingerprintSettings extends SubSettings {
@VisibleForTesting @VisibleForTesting
void deleteFingerPrint(Fingerprint fingerPrint) { void deleteFingerPrint(Fingerprint fingerPrint) {
mRemovalSidecar.startRemove(fingerPrint, mUserId); mRemovalSidecar.startRemove(fingerPrint, mUserId);
String name = genKey(fingerPrint.getFingerId()); String name = genKey(fingerPrint.getBiometricId());
Preference prefToRemove = findPreference(name); Preference prefToRemove = findPreference(name);
prefToRemove.setEnabled(false); prefToRemove.setEnabled(false);
updateAddPreference(); updateAddPreference();
@@ -711,7 +711,7 @@ public class FingerprintSettings extends SubSettings {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) { if (which == DialogInterface.BUTTON_POSITIVE) {
final int fingerprintId = mFp.getFingerId(); final int fingerprintId = mFp.getBiometricId();
Log.v(TAG, "Removing fpId=" + fingerprintId); Log.v(TAG, "Removing fpId=" + fingerprintId);
mMetricsFeatureProvider.action(getContext(), mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_FINGERPRINT_DELETE, MetricsEvent.ACTION_FINGERPRINT_DELETE,
@@ -760,11 +760,11 @@ public class FingerprintSettings extends SubSettings {
Log.d(TAG, "rename " + name + " to " + newName); Log.d(TAG, "rename " + name + " to " + newName);
mMetricsFeatureProvider.action(getContext(), mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_FINGERPRINT_RENAME, MetricsEvent.ACTION_FINGERPRINT_RENAME,
mFp.getFingerId()); mFp.getBiometricId());
FingerprintSettingsFragment parent FingerprintSettingsFragment parent
= (FingerprintSettingsFragment) = (FingerprintSettingsFragment)
getTargetFragment(); getTargetFragment();
parent.renameFingerPrint(mFp.getFingerId(), parent.renameFingerPrint(mFp.getBiometricId(),
newName); newName);
} }
dialog.dismiss(); dialog.dismiss();

2
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -682,7 +682,7 @@ public class ChooseLockGeneric extends SettingsActivity {
CharSequence errString) { CharSequence errString) {
Log.e(TAG, String.format( Log.e(TAG, String.format(
"Can't remove fingerprint %d in group %d. Reason: %s", "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 // TODO: need to proceed with the removal of managed profile
// fingerprints and finish() gracefully. // fingerprints and finish() gracefully.
} }