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

Commit 907391e7 authored by James Willcox's avatar James Willcox Committed by Automerger Merge Worker
Browse files

Merge "Enable the CredentialManager Registry API" into udc-dev am: 4610fcb3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23865683



Change-Id: Ic8227e186f9390e84984801cecc62b8db216eca0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86b379ea 4610fcb3

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

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



    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_WRITE_SECURE_SETTINGS_ERROR =

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



    public static boolean isCredentialDescriptionApiEnabled() {

        final long origId = Binder.clearCallingIdentity();

        try {

            return DeviceConfig.getBoolean(

                    DeviceConfig.NAMESPACE_CREDENTIAL, DEVICE_CONFIG_ENABLE_CREDENTIAL_DESC_API,

                    false);

        } finally {

            Binder.restoreCallingIdentity(origId);

        }

        return true;

    }



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