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

Commit d0b8f0a9 authored by James Willcox's avatar James Willcox
Browse files

Enable the CredentialManager Registry API 

We cannot change the flag that this is using, so abandon it entirely and
turn it on the registry all the time.

Bug: 289435946
Test: local
Change-Id: I7f509eacaf8a973a290f9e429b3705d975bbfccf
parent 94962378

services/credentials/java/com/android/server/credentials/CredentialManagerService.java

+1 −10
Original line number Original line Diff line number Diff line
@@ -91,8 +91,6 @@ public final class CredentialManagerService 
        CredentialManagerService, CredentialManagerServiceImpl> {

        CredentialManagerService, CredentialManagerServiceImpl> {





    private static final String TAG = "CredManSysService";

    private static final String TAG = "CredManSysService";

    private static final String DEVICE_CONFIG_ENABLE_CREDENTIAL_DESC_API =

            "enable_credential_description_api";

    private static final String PERMISSION_DENIED_ERROR = "permission_denied";

    private static final String PERMISSION_DENIED_ERROR = "permission_denied";

    private static final String PERMISSION_DENIED_WRITE_SECURE_SETTINGS_ERROR =

    private static final String PERMISSION_DENIED_WRITE_SECURE_SETTINGS_ERROR =

            "Caller is missing WRITE_SECURE_SETTINGS permission";

            "Caller is missing WRITE_SECURE_SETTINGS permission";
@@ -311,14 +309,7 @@ public final class CredentialManagerService 
    }

    }





    public static boolean isCredentialDescriptionApiEnabled() {

    public static boolean isCredentialDescriptionApiEnabled() {

        final long origId = Binder.clearCallingIdentity();

        return true;

        try {

            return DeviceConfig.getBoolean(

                    DeviceConfig.NAMESPACE_CREDENTIAL, DEVICE_CONFIG_ENABLE_CREDENTIAL_DESC_API,

                    false);

        } finally {

            Binder.restoreCallingIdentity(origId);

        }

    }

    }





    @SuppressWarnings("GuardedBy") // ErrorProne requires initiateProviderSessionForRequestLocked

    @SuppressWarnings("GuardedBy") // ErrorProne requires initiateProviderSessionForRequestLocked