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

Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev

Browse Source 
am: ba4fad160d

Change-Id: Iea3b2552097a1decd9dc106e3a31d71d772ab1d6
This commit is contained in:
Kevin Chyn
2019-07-26 12:35:33 -07:00
committed by android-build-merger
parent 8611a6d851 ba4fad160d
commit 6fdc3745c3
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/password/BiometricFragment.java
View File

@@ -58,11 +58,13 @@ public class BiometricFragment extends InstrumentedFragment {
private Bundle mBundle; private Bundle mBundle;
private BiometricPrompt mBiometricPrompt; private BiometricPrompt mBiometricPrompt;
private CancellationSignal mCancellationSignal; private CancellationSignal mCancellationSignal;
private boolean mAuthenticating;
private AuthenticationCallback mAuthenticationCallback = private AuthenticationCallback mAuthenticationCallback =
new AuthenticationCallback() { new AuthenticationCallback() {
@Override @Override
public void onAuthenticationError(int error, @NonNull CharSequence message) { public void onAuthenticationError(int error, @NonNull CharSequence message) {
mAuthenticating = false;
mClientExecutor.execute(() -> { mClientExecutor.execute(() -> {
mClientCallback.onAuthenticationError(error, message); mClientCallback.onAuthenticationError(error, message);
}); });
@@ -71,6 +73,7 @@ public class BiometricFragment extends InstrumentedFragment {
@Override @Override
public void onAuthenticationSucceeded(AuthenticationResult result) { public void onAuthenticationSucceeded(AuthenticationResult result) {
mAuthenticating = false;
mClientExecutor.execute(() -> { mClientExecutor.execute(() -> {
mClientCallback.onAuthenticationSucceeded(result); mClientCallback.onAuthenticationSucceeded(result);
}); });
@@ -134,6 +137,10 @@ public class BiometricFragment extends InstrumentedFragment {
} }
} }
boolean isAuthenticating() {
return mAuthenticating;
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -180,6 +187,7 @@ public class BiometricFragment extends InstrumentedFragment {
mCancellationSignal = new CancellationSignal(); mCancellationSignal = new CancellationSignal();
// TODO: CC doesn't use crypto for now // TODO: CC doesn't use crypto for now
mAuthenticating = true;
mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor, mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
mAuthenticationCallback, mUserId, mCancelCallback); mAuthenticationCallback, mUserId, mCancelCallback);
} }

3
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -251,8 +251,11 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
if (!isChangingConfigurations()) { if (!isChangingConfigurations()) {
mGoingToBackground = true; mGoingToBackground = true;
if (mBiometricFragment != null) { if (mBiometricFragment != null) {
Log.d(TAG, "Authenticating: " + mBiometricFragment.isAuthenticating());
if (mBiometricFragment.isAuthenticating()) {
mBiometricFragment.cancel(); mBiometricFragment.cancel();
} }
}
if (mIsFallback && !mCCLaunched) { if (mIsFallback && !mCCLaunched) {
mBiometricManager.onConfirmDeviceCredentialError( mBiometricManager.onConfirmDeviceCredentialError(