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

Merge "Move DeviceConfig check to Service" into udc-dev am: 5b79181920

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

Change-Id: Ie4a0f95b1e8dda68a3fdce6f37618b7ac4822391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Becca Hughes
2023-04-05 17:29:37 +00:00
committed by Automerger Merge Worker
parent 25b5b00ad0 5b79181920
commit 76ea2302ff
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/credentials/CredentialManager.java
View File

@@ -460,9 +460,17 @@ public final class CredentialManager {
return false;
}
/**
* Returns whether the service is enabled.
*
* @hide
*/
private boolean isServiceEnabled() {
return DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_CREDENTIAL, DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER, true);
try {
return mService.isServiceEnabled();
} catch (RemoteException e) {
return false;
}
}
/**

2
core/java/android/credentials/ICredentialManager.aidl
View File

@@ -58,5 +58,7 @@ interface ICredentialManager {
List<CredentialProviderInfo> getCredentialProviderServices(in int userId, in int providerFilter);
List<CredentialProviderInfo> getCredentialProviderServicesForTesting(in int providerFilter);
boolean isServiceEnabled();
}

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

@@ -784,6 +784,19 @@ public final class CredentialManagerService
mContext, userId, providerFilter, getEnabledProviders());
}
@Override
public boolean isServiceEnabled() {
final long origId = Binder.clearCallingIdentity();
try {
return DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_CREDENTIAL,
CredentialManager.DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER,
false);
} finally {
Binder.restoreCallingIdentity(origId);
}
}
@SuppressWarnings("GuardedBy") // ErrorProne requires service.mLock which is the same
// this.mLock
private Set<ComponentName> getEnabledProviders() {