Merge "Enable the CredentialManager Registry API" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4610fcb304
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user