diff options
3 files changed, 7 insertions, 1 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index ea3235bfff6c..fc4277e60bc5 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -42,6 +42,10 @@ applications that come with the platform <permission name="android.permission.READ_SYSTEM_GRAMMATICAL_GENDER"/> </privapp-permissions> + <privapp-permissions package="com.android.credentialmanager"> + <permission name="android.permission.SET_BIOMETRIC_DIALOG_ADVANCED" /> + </privapp-permissions> + <privapp-permissions package="com.android.externalstorage"> <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> <permission name="android.permission.WRITE_MEDIA_STORAGE"/> diff --git a/packages/CredentialManager/AndroidManifest.xml b/packages/CredentialManager/AndroidManifest.xml index 7a8c25bd12ab..1ac8e19c2bc6 100644 --- a/packages/CredentialManager/AndroidManifest.xml +++ b/packages/CredentialManager/AndroidManifest.xml @@ -21,6 +21,7 @@ <uses-permission android:name="android.permission.LAUNCH_CREDENTIAL_SELECTOR"/> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> + <uses-permission android:name="android.permission.SET_BIOMETRIC_DIALOG_ADVANCED"/> <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/> <uses-permission android:name="android.permission.ACCESS_INSTANT_APPS" /> <uses-permission android:name="android.permission.USE_BIOMETRIC" /> diff --git a/packages/CredentialManager/src/com/android/credentialmanager/common/BiometricHandler.kt b/packages/CredentialManager/src/com/android/credentialmanager/common/BiometricHandler.kt index db5ab569535f..d21077ee7c5a 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/common/BiometricHandler.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/common/BiometricHandler.kt @@ -175,7 +175,8 @@ private fun setupBiometricPrompt( } .setAllowedAuthenticators(finalAuthenticators) .setConfirmationRequired(true) - // TODO(b/326243754) : Add logo back once new permission privileges sorted out + .setLogoBitmap(biometricDisplayInfo.providerIcon) + .setLogoDescription(biometricDisplayInfo.providerName) .setDescription(biometricDisplayInfo.descriptionAboveBiometricButton) .build() |