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

Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev am: d66e0c4c75

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20249709

Change-Id: If6de61542beed2a43d775a0b3706b11a95b5160b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2022-10-25 21:07:53 +00:00
committed by Automerger Merge Worker
parent 6d2a0cdf0d d66e0c4c75
commit da8c78f093
3 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
View File

@@ -21,9 +21,14 @@ import android.app.settings.SettingsEnums;
import android.hardware.fingerprint.FingerprintManager;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollSidecar;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
/**
* Sidecar fragment to handle the state around fingerprint enrollment.
*/
@@ -32,11 +37,19 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
private FingerprintUpdater mFingerprintUpdater;
private @FingerprintManager.EnrollReason int mEnrollReason;
private Set<Integer> mHelpIgnore;
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
mFingerprintUpdater = new FingerprintUpdater(activity);
final int[] ignoreAcquiredInfo = getResources().getIntArray(
R.array.fingerprint_acquired_ignore_list);
mHelpIgnore = new HashSet<>();
for (int acquiredInfo: ignoreAcquiredInfo) {
mHelpIgnore.add(acquiredInfo);
}
mHelpIgnore = Collections.unmodifiableSet(mHelpIgnore);
}
@Override
@@ -49,7 +62,6 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
getString(R.string.fingerprint_intro_error_unknown));
return;
}
mFingerprintUpdater.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback,
mEnrollReason);
}
@@ -58,7 +70,7 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
mEnrollReason = enrollReason;
}
private FingerprintManager.EnrollmentCallback mEnrollmentCallback
@VisibleForTesting FingerprintManager.EnrollmentCallback mEnrollmentCallback
= new FingerprintManager.EnrollmentCallback() {
@Override
@@ -68,6 +80,9 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
@Override
public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
if (mHelpIgnore.contains(helpMsgId)) {
return;
}
FingerprintEnrollSidecar.super.onEnrollmentHelp(helpMsgId, helpString);
}