diff options
| author | Ruslan Tkhakokhov <rthakohov@google.com> | 2020-06-16 16:46:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 16:46:00 +0000 |
| commit | 62bdcabed581ad913ba92095002b6f893bc6af92 (patch) | |
| tree | a8f1bea9c45f09fa4008c957556c4fbba4167876 /packages/SettingsProvider/src | |
| parent | 8c9db5dd546967def2282a68d66b30a94d72ea21 (diff) | |
| parent | f2fd74fbdb2524408fbc069321fd87d16fe658b2 (diff) | |
Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fbdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867444
Change-Id: I5e01eb1280a4e231a647c6301f0f7ae93e391493
Diffstat (limited to 'packages/SettingsProvider/src')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java | 4 |
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); } |