diff options
| author | 2023-07-11 20:25:01 +0000 | |
|---|---|---|
| committer | 2023-07-11 20:25:01 +0000 | |
| commit | d9c67d3470c2ba151a9c145c86b954f8ff6cfb6a (patch) | |
| tree | 4e223b33fe082ed7e10838906cdb855433d277c9 | |
| parent | 99460de03ee9bb51c405c553318e9b5d8746688c (diff) | |
| parent | 5762138e08a4f6f40f5853fddea08abfedc2e441 (diff) | |
Merge "Enable the CredentialManager Registry API" into udc-dev am: 4610fcb304 am: 5762138e08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23865683
Change-Id: I95738555a491de04e64778f038e50af338c69fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/credentials/java/com/android/server/credentials/CredentialManagerService.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java index a1199d99f1c3..6747cea80115 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerService.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerService.java @@ -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 |