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

Merge "Switch config to string array" into udc-dev am: 3b9e97a196

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

Change-Id: Ic4340110f9c912645c65e0433dffb55c339cd207
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:27:27 +00:00
committed by Automerger Merge Worker
parent d32f9b0164 3b9e97a196
commit 25b5b00ad0
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4461,7 +4461,8 @@
See android.credentials.CredentialManager
-->
<string name="config_defaultCredentialProviderService" translatable="false"></string>
<string-array name="config_defaultCredentialProviderService" translatable="false">
</string-array>
<!-- The package name for the system's smartspace service.
This service returns smartspace results.

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

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

37
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 = 216;
private static final int SETTINGS_VERSION = 217;
private final int mUserId;
@@ -5711,7 +5711,7 @@ public class SettingsProvider extends ContentProvider {
.getSettingLocked(Settings.Secure.CREDENTIAL_SERVICE);
if (currentSetting.isNull()) {
final int resourceId =
com.android.internal.R.string.config_defaultCredentialProviderService;
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
@@ -5771,6 +5771,39 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 216;
}
if (currentVersion == 216) {
// Version 216: Set a default value for Credential Manager service.
// We are doing this migration again because of an incorrect setting.
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.
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, defaultValue, null, true,
SettingsState.SYSTEM_PACKAGE_NAME);
}
}
currentVersion = 217;
}
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {