Store original values of replaced settings in Settings.Secure

Bug: 153940088
Test: atest SettingsProviderTest:SettingsHelperTest

Writing new settings to Settings.System is only available to privileged
callers. Move the storage of the original values of replaced settings to
Settings.Secure. See the attached bug for more context on replaced
settings.

Change-Id: I8f1e8e88da4766b5fca9362cdbe88d93b964db9b

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
index 75b680dd3a88..bec8151a1351 100644
--- 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);
     }