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

Commit f3bf0e18 authored by Becca Hughes's avatar Becca Hughes Committed by Automerger Merge Worker
Browse files

Merge "Fix build due to missing ref" into udc-dev am: 9e90c675 

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



Change-Id: I7312e8487cd14ac7c4b0e8e1246f46f8f5275d1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f50babe9 9e90c675

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

+3 −1
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ public final class CredentialManagerService 
    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";

    private static final String DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER =

            "enable_credential_manager";



    private final Context mContext;
@@ -790,7 +792,7 @@ public final class CredentialManagerService 
            try {

                return DeviceConfig.getBoolean(

                        DeviceConfig.NAMESPACE_CREDENTIAL,

                        CredentialManager.DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER,

                        DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER,

                        false);

            } finally {

                Binder.restoreCallingIdentity(origId);