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

Merge "Fix build due to missing ref" into udc-dev

Browse Source
This commit is contained in:
Becca Hughes
2023-04-05 19:47:57 +00:00
committed by Android (Google) Code Review
parent 1a6fb9286d 4393a8d05b
commit 9e90c675bc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,6 +96,8 @@ public final class CredentialManagerService
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";
private static final String DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER =
"enable_credential_manager";
private final Context mContext; private final Context mContext;
@@ -790,7 +792,7 @@ public final class CredentialManagerService
try { try {
return DeviceConfig.getBoolean( return DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_CREDENTIAL, DeviceConfig.NAMESPACE_CREDENTIAL,
CredentialManager.DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER, DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER,
false); false);
} finally { } finally {
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);