| Révision | adef4840f3ffdc97503fe1ac0943381d43efe10d (tree) |
|---|---|
| l'heure | 2019-07-29 07:26:26 |
| Auteur | Kevin Chyn <kchyn@goog...> |
| Commiter | android-build-team Robot |
Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.
BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.
The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.
Bug: 138279856
Test: BiometricPromptDemo, enable device credential fallback, get into
Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
(cherry picked from commit 49c7d0765090750f88f11153dfcf9ec378b0c84d)
src/com/android/settings/password/BiometricFragment.java (diff) src/com/android/settings/password/ConfirmDeviceCredentialActivity.java (diff)| @@ -58,11 +58,13 @@ public class BiometricFragment extends InstrumentedFragment { | ||
| 58 | 58 | private Bundle mBundle; |
| 59 | 59 | private BiometricPrompt mBiometricPrompt; |
| 60 | 60 | private CancellationSignal mCancellationSignal; |
| 61 | + private boolean mAuthenticating; | |
| 61 | 62 | |
| 62 | 63 | private AuthenticationCallback mAuthenticationCallback = |
| 63 | 64 | new AuthenticationCallback() { |
| 64 | 65 | @Override |
| 65 | 66 | public void onAuthenticationError(int error, @NonNull CharSequence message) { |
| 67 | + mAuthenticating = false; | |
| 66 | 68 | mClientExecutor.execute(() -> { |
| 67 | 69 | mClientCallback.onAuthenticationError(error, message); |
| 68 | 70 | }); |
| @@ -71,6 +73,7 @@ public class BiometricFragment extends InstrumentedFragment { | ||
| 71 | 73 | |
| 72 | 74 | @Override |
| 73 | 75 | public void onAuthenticationSucceeded(AuthenticationResult result) { |
| 76 | + mAuthenticating = false; | |
| 74 | 77 | mClientExecutor.execute(() -> { |
| 75 | 78 | mClientCallback.onAuthenticationSucceeded(result); |
| 76 | 79 | }); |
| @@ -134,6 +137,10 @@ public class BiometricFragment extends InstrumentedFragment { | ||
| 134 | 137 | } |
| 135 | 138 | } |
| 136 | 139 | |
| 140 | + boolean isAuthenticating() { | |
| 141 | + return mAuthenticating; | |
| 142 | + } | |
| 143 | + | |
| 137 | 144 | @Override |
| 138 | 145 | public void onCreate(Bundle savedInstanceState) { |
| 139 | 146 | super.onCreate(savedInstanceState); |
| @@ -180,6 +187,7 @@ public class BiometricFragment extends InstrumentedFragment { | ||
| 180 | 187 | mCancellationSignal = new CancellationSignal(); |
| 181 | 188 | |
| 182 | 189 | // TODO: CC doesn't use crypto for now |
| 190 | + mAuthenticating = true; | |
| 183 | 191 | mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor, |
| 184 | 192 | mAuthenticationCallback, mUserId, mCancelCallback); |
| 185 | 193 | } |
| @@ -251,7 +251,10 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { | ||
| 251 | 251 | if (!isChangingConfigurations()) { |
| 252 | 252 | mGoingToBackground = true; |
| 253 | 253 | if (mBiometricFragment != null) { |
| 254 | - mBiometricFragment.cancel(); | |
| 254 | + Log.d(TAG, "Authenticating: " + mBiometricFragment.isAuthenticating()); | |
| 255 | + if (mBiometricFragment.isAuthenticating()) { | |
| 256 | + mBiometricFragment.cancel(); | |
| 257 | + } | |
| 255 | 258 | } |
| 256 | 259 | |
| 257 | 260 | if (mIsFallback && !mCCLaunched) { |
Android-x86
Fork