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

Merge "Add a new config to support primary credential providers. Also renamed the existing defaultCredentialProvider to enabledCredentialProvider to reduce the confusiton." into udc-dev

Browse Source
This commit is contained in:
Guangjie (Jerry) Shi
2023-05-04 00:05:18 +00:00
committed by Android (Google) Code Review
parent abbe7c5638 5062b6eab9
commit 02e6c5d7e5
3 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/res/res/values/config.xml
View File

@@ -4483,17 +4483,27 @@
-->
<string name="config_defaultCredentialManagerHybridService" translatable="false"></string>
<!-- The component name, flattened to a string, for the system's credential manager
provider service. This service allows credential retrieval and storage od credentials.
<!-- The component name(s), flattened to a string, for the system's credential manager
provider services. These services allow retrieving and storing credentials.
This service must be trusted, as it can be activated without explicit consent of the user.
These services must be trusted, as they can be activated without explicit consent of the user.
If no service with the specified name exists on the device, there will be no user configurable
provider to service credential manager requests. However, credential manager system
services that do not require user consent, will still work.
See android.credentials.CredentialManager
-->
<string-array name="config_defaultCredentialProviderService" translatable="false">
<string-array name="config_enabledCredentialProviderService" translatable="false">
</string-array>
<!-- The component name(s), flattened to a string, for the system's primary credential manager
provider services. These service will be used by default for storing credentials.
These services must be trusted, as they can be activated without explicit consent of the user.
See android.credentials.CredentialManager
-->
<string-array name="config_primaryCredentialProviderService" translatable="false">
</string-array>
<!-- The package name for the system's smartspace service.

3
core/res/res/values/symbols.xml
View File

@@ -3759,7 +3759,8 @@
<java-symbol type="string" name="config_defaultAppPredictionService" />
<java-symbol type="string" name="config_defaultContentSuggestionsService" />
<java-symbol type="string" name="config_defaultCredentialManagerHybridService" />
<java-symbol type="array" name="config_defaultCredentialProviderService" />
<java-symbol type="array" name="config_enabledCredentialProviderService" />
<java-symbol type="array" name="config_primaryCredentialProviderService" />
<java-symbol type="string" name="config_defaultSearchUiService" />
<java-symbol type="string" name="config_defaultSmartspaceService" />
<java-symbol type="string" name="config_defaultWallpaperEffectsGenerationService" />

74
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -3748,7 +3748,7 @@ public class SettingsProvider extends ContentProvider {
}
private final class UpgradeController {
private static final int SETTINGS_VERSION = 219;
private static final int SETTINGS_VERSION = 220;
private final int mUserId;
@@ -5656,45 +5656,7 @@ public class SettingsProvider extends ContentProvider {
}
if (currentVersion == 214) {
// Version 214: Set a default value for Credential Manager service.
final SettingsState secureSettings = getSecureSettingsLocked(userId);
final Setting currentSetting = secureSettings
.getSettingLocked(Settings.Secure.CREDENTIAL_SERVICE);
if (currentSetting.isNull()) {
final int resourceId =
com.android.internal.R.array.config_defaultCredentialProviderService;
final Resources resources = getContext().getResources();
// If the config has not be defined we might get an exception. We also get
// values from both the string array type and the single string in case the
// OEM uses the wrong one.
final List<String> providers = new ArrayList<>();
try {
providers.addAll(Arrays.asList(resources.getStringArray(resourceId)));
} catch (Resources.NotFoundException e) {
Slog.w(LOG_TAG,
"Get default array Cred Provider not found: " + e.toString());
}
try {
final String storedValue = resources.getString(resourceId);
if (!TextUtils.isEmpty(storedValue)) {
providers.add(storedValue);
}
} catch (Resources.NotFoundException e) {
Slog.w(LOG_TAG,
"Get default Cred Provider not found: " + e.toString());
}
if (!providers.isEmpty()) {
final String defaultValue = String.join(":", providers);
Slog.d(LOG_TAG, "Setting [" + defaultValue + "] as CredMan Service "
+ "for user " + userId);
secureSettings.insertSettingOverrideableByRestoreLocked(
Settings.Secure.CREDENTIAL_SERVICE, defaultValue, null, true,
SettingsState.SYSTEM_PACKAGE_NAME);
}
}
// Version 214: Removed, moved to version 216
currentVersion = 215;
}
@@ -5732,7 +5694,7 @@ public class SettingsProvider extends ContentProvider {
.getSettingLocked(Settings.Secure.CREDENTIAL_SERVICE);
if (currentSetting.isNull()) {
final int resourceId =
com.android.internal.R.array.config_defaultCredentialProviderService;
com.android.internal.R.array.config_enabledCredentialProviderService;
final Resources resources = getContext().getResources();
// If the config has not be defined we might get an exception.
final List<String> providers = new ArrayList<>();
@@ -5848,6 +5810,36 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 219;
}
if (currentVersion == 219) {
final SettingsState secureSettings = getSecureSettingsLocked(userId);
final Setting currentSetting = secureSettings
.getSettingLocked(Settings.Secure.CREDENTIAL_SERVICE_PRIMARY);
if (currentSetting.isNull()) {
final int resourceId =
com.android.internal.R.array.config_primaryCredentialProviderService;
final Resources resources = getContext().getResources();
// If the config has not be defined we might get an exception.
final List<String> providers = new ArrayList<>();
try {
providers.addAll(Arrays.asList(resources.getStringArray(resourceId)));
} catch (Resources.NotFoundException e) {
Slog.w(LOG_TAG,
"Get default array Cred Provider not found: " + e.toString());
}
if (!providers.isEmpty()) {
final String defaultValue = String.join(":", providers);
Slog.d(LOG_TAG, "Setting [" + defaultValue + "] as CredMan Service "
+ "for user " + userId);
secureSettings.insertSettingOverrideableByRestoreLocked(
Settings.Secure.CREDENTIAL_SERVICE_PRIMARY, defaultValue, null,
true, SettingsState.SYSTEM_PACKAGE_NAME);
}
}
currentVersion = 220;
}
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {