Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca9b3460 authored by Arpan's avatar Arpan
Browse files

Fixing permission for Biometric Logos in CredMan 

The issue is thoroughly documented in the bug, but this change ensures
that the biometric logo setting can be done. There is strange behaviour
with 'signature|privilege' where the new 'privilege' scope appears to
break the 'OR' relationship for our framework UI codebase.

Now, we've added the framework UI package within the privapp allowlist
for that single permission.

Bug: 330906693
Test: Build and UI Test On b/329874867

Change-Id: Ic9dcd4a7e31f5b439ccd807b4ea454cf2cee55a0
parent 46fb9911

data/etc/privapp-permissions-platform.xml

+4 −0
Original line number Diff line number Diff line
@@ -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"/>

packages/CredentialManager/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

packages/CredentialManager/src/com/android/credentialmanager/common/BiometricHandler.kt

+2 −1
Original line number Diff line number Diff line
@@ -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()