Fix ConfirmDeviceCredentials for work profiles
1) Fixed the theme for CDCA$InternalActivity to be transparent 2) CDCA only cares about biometrics, which are tied to userId 3) Moved shared methods to a util class Fixes: 119296586 Test: Followed the steps in comment#1 of the bug linked above Change-Id: Ie47fc7c3a53dfb7780087937e1ca83287cc52d71
This commit is contained in:
@@ -50,6 +50,9 @@ public class BiometricFragment extends InstrumentedFragment {
|
||||
private Executor mClientExecutor;
|
||||
private AuthenticationCallback mClientCallback;
|
||||
|
||||
// Re-settable by the application.
|
||||
private int mUserId;
|
||||
|
||||
// Created/Initialized once and retained
|
||||
private final Handler mHandler = new Handler(Looper.getMainLooper());
|
||||
private PromptInfo mPromptInfo;
|
||||
@@ -96,6 +99,10 @@ public class BiometricFragment extends InstrumentedFragment {
|
||||
mClientCallback = callback;
|
||||
}
|
||||
|
||||
public void setUser(int userId) {
|
||||
mUserId = userId;
|
||||
}
|
||||
|
||||
public void cancel() {
|
||||
if (mCancellationSignal != null) {
|
||||
mCancellationSignal.cancel();
|
||||
@@ -126,8 +133,8 @@ public class BiometricFragment extends InstrumentedFragment {
|
||||
mCancellationSignal = new CancellationSignal();
|
||||
|
||||
// TODO: CC doesn't use crypto for now
|
||||
mBiometricPrompt.authenticate(mCancellationSignal, mClientExecutor,
|
||||
mAuthenticationCallback);
|
||||
mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
|
||||
mAuthenticationCallback, mUserId);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user