Merge "Enable the CredentialManager Registry API" into udc-dev am: 4610fcb304
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user