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

Merge "Add support for default providers" into udc-dev

Browse Source
This commit is contained in:
Becca Hughes
2023-03-09 23:26:14 +00:00
committed by Android (Google) Code Review
parent ae24ed697b 1bf1e411ec
commit a564add27c
1 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3746,7 +3746,7 @@ public class SettingsProvider extends ContentProvider {
}
private final class UpgradeController {
private static final int SETTINGS_VERSION = 214;
private static final int SETTINGS_VERSION = 215;
private final int mUserId;
@@ -5701,6 +5701,49 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 214;
}
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.string.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);
}
}
currentVersion = 215;
}
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {