From 52669b07209db659e98df5a9ebafbfae91687372 Mon Sep 17 00:00:00 2001 From: Ruslan Tkhakokhov Date: Mon, 15 Jun 2020 17:21:38 +0100 Subject: 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 --- .../src/com/android/providers/settings/SettingsHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); } -- cgit v1.2.3-59-g8ed1b