Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I68d82d2108db834f077348c59dc6740dcf80ae85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
James Willcox
2023-07-11 19:39:58 +00:00
committed by Automerger Merge Worker
parent b0361e1411 4610fcb304
commit 5762138e08
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/credentials/java/com/android/server/credentials/CredentialManagerService.java
View File

@@ -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