diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 72a2e43bc8c8d..fcb0e08141e4f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1286,6 +1286,16 @@ com.android.networkrecommendation + + com.android.networkrecommendation + + diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 499b6ae0f5d31..136f17e5a77c4 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -227,7 +227,4 @@ 0x2 - - - com.android.networkrecommendation diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index edcb9b51fceb8..d5787e6482b57 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -3182,24 +3182,7 @@ public class SettingsProvider extends ContentProvider { } 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); - } + // Version 139: Removed. currentVersion = 139; }