Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev

2020-06-16 16:22:38 +00:00
parent e184e6c819 52669b0720
commit f2fd74fbdb
1 changed files with 3 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -219,7 +219,9 @@ public class SettingsHelper {
     */
    @VisibleForTesting
    public String getRealValueForSystemSetting(String setting) {
-        return Settings.System.getString(mContext.getContentResolver(),
+        // The real value irrespectively of the original setting's namespace is stored in
+        // Settings.Secure.
+        return Settings.Secure.getString(mContext.getContentResolver(),
                setting + SETTING_ORIGINAL_KEY_SUFFIX);
    }