Add a new setting to store the network recommendation app.
Test: manual
Bug: 35095406
Change-Id: I3d0b7f3b977c0862969d61a4e46f12151eb15417
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 2299794..edcb9b5 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2735,7 +2735,7 @@
}
private final class UpgradeController {
- private static final int SETTINGS_VERSION = 138;
+ private static final int SETTINGS_VERSION = 139;
private final int mUserId;
@@ -3118,26 +3118,7 @@
}
if (currentVersion == 135) {
- // Version 135: Migrating the NETWORK_SCORER_APP setting to the
- // NETWORK_RECOMMENDATIONS_ENABLED setting.
- if (userId == UserHandle.USER_SYSTEM) {
- final SettingsState globalSettings = getGlobalSettingsLocked();
- Setting currentSetting = globalSettings.getSettingLocked(
- Global.NETWORK_SCORER_APP);
- if (!currentSetting.isNull()) {
- // A scorer was set so enable recommendations.
- globalSettings.insertSettingLocked(
- Global.NETWORK_RECOMMENDATIONS_ENABLED,
- "1", null, true,
- SettingsState.SYSTEM_PACKAGE_NAME);
-
- // and clear the scorer setting since it's no longer needed.
- globalSettings.insertSettingLocked(
- Global.NETWORK_SCORER_APP,
- null, null, true,
- SettingsState.SYSTEM_PACKAGE_NAME);
- }
- }
+ // Version 135 no longer used.
currentVersion = 136;
}
@@ -3200,6 +3181,28 @@
currentVersion = 138;
}
+ if (currentVersion == 138) {
+ // Version 139: Applying the default to NETWORK_RECOMMENDATIONS_PACKAGE
+ if (userId == UserHandle.USER_SYSTEM) {
+ final SettingsState globalSettings = getGlobalSettingsLocked();
+ final String defaultAppPackage = getContext().getResources()
+ .getString(R.string.def_network_recommendations_package);
+
+ // Set the network recommendations package name
+ globalSettings.insertSettingLocked(
+ Global.NETWORK_RECOMMENDATIONS_PACKAGE,
+ defaultAppPackage, null, true,
+ SettingsState.SYSTEM_PACKAGE_NAME);
+
+ // Clear the scorer setting since it's no longer needed.
+ globalSettings.insertSettingLocked(
+ Global.NETWORK_SCORER_APP,
+ null, null, true,
+ SettingsState.SYSTEM_PACKAGE_NAME);
+ }
+ currentVersion = 139;
+ }
+
if (currentVersion != newVersion) {
Slog.wtf("SettingsProvider", "warning: upgrading settings database to version "
+ newVersion + " left it at "