Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "face-dialog"

Browse Source 
* changes:
  3/n: Add FaceDialogView and "confirmation" plumbing
  2/n: Refactor common code from FingerprintDialogView
  1/n: Rename FingerprintDialogView to BiometricDialogView
This commit is contained in:
Kevin Chyn
2018-09-21 04:34:59 +00:00
committed by Android (Google) Code Review
parent 6df15718f9 6cf54e8190
commit c31c757852
30 changed files with 760 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/hardware/face/FaceManager.java
View File

@@ -521,16 +521,16 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
*/
public static String getErrorString(Context context, int errMsg, int vendorCode) {
switch (errMsg) {
case FACE_ERROR_HW_UNAVAILABLE:
return context.getString(
com.android.internal.R.string.face_error_hw_not_available);
case FACE_ERROR_UNABLE_TO_PROCESS:
return context.getString(
com.android.internal.R.string.face_error_unable_to_process);
case FACE_ERROR_TIMEOUT:
return context.getString(com.android.internal.R.string.face_error_timeout);
case FACE_ERROR_HW_UNAVAILABLE:
return context.getString(
com.android.internal.R.string.face_error_hw_not_available);
case FACE_ERROR_NO_SPACE:
return context.getString(com.android.internal.R.string.face_error_no_space);
case FACE_ERROR_TIMEOUT:
return context.getString(com.android.internal.R.string.face_error_timeout);
case FACE_ERROR_CANCELED:
return context.getString(com.android.internal.R.string.face_error_canceled);
case FACE_ERROR_LOCKOUT:
@@ -538,6 +538,8 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
case FACE_ERROR_LOCKOUT_PERMANENT:
return context.getString(
com.android.internal.R.string.face_error_lockout_permanent);
case FACE_ERROR_USER_CANCELED:
return context.getString(com.android.internal.R.string.face_error_user_canceled);
case FACE_ERROR_NOT_ENROLLED:
return context.getString(com.android.internal.R.string.face_error_not_enrolled);
case FACE_ERROR_HW_NOT_PRESENT:

4
core/java/android/hardware/face/IFaceService.aidl
View File

@@ -34,8 +34,8 @@ interface IFaceService {
// This method invokes the BiometricDialog. The arguments are almost the same as above,
// but should only be called from (BiometricPromptService).
void authenticateFromService(IBinder token, long sessionId, int userId,
IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
void authenticateFromService(boolean requireConfirmation, IBinder token, long sessionId,
int userId, IBiometricPromptServiceReceiver receiver, int flags, String opPackageName,
in Bundle bundle, IBiometricPromptReceiver dialogReceiver,
int callingUid, int callingPid, int callingUserId);

3
core/java/com/android/internal/statusbar/IStatusBar.aidl
View File

@@ -141,7 +141,8 @@ oneway interface IStatusBar
void showShutdownUi(boolean isReboot, String reason);
// Used to show the dialog when BiometricService starts authentication
void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type);
void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type,
boolean requireConfirmation);
// Used to hide the dialog when a biometric is authenticated
void onBiometricAuthenticated();
// Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc

3
core/java/com/android/internal/statusbar/IStatusBarService.aidl
View File

@@ -91,7 +91,8 @@ interface IStatusBarService
void showPinningEscapeToast();
// Used to show the dialog when BiometricService starts authentication
void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type);
void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type,
boolean requireConfirmation);
// Used to hide the dialog when a biometric is authenticated
void onBiometricAuthenticated();
// Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc