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

Move DeviceConfig check to Service

Browse Source 
Moves DC feature flag evalutation to
service since clients do not have
permisssion.

Test: gts
Bug: 275754582
Change-Id: Ic56cae1ad52d9df2daab6c82da0e57087a91408c
This commit is contained in:
Becca Hughes
2023-03-29 23:50:30 +00:00
parent 71dac9dba1
commit 3b1802458d
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

@@ -825,6 +825,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() {