diff options
| author | Ruslan Tkhakokhov <rthakohov@google.com> | 2020-05-05 11:57:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-05 11:57:52 +0000 |
| commit | 951d75d4f8fd644890c4aec968c14488ad543dbb (patch) | |
| tree | 008cf7cf79ae9554149c3b0567a733483f58b002 /packages/SettingsProvider/src | |
| parent | 92703c0e2aa18f53c0df59f95849bc2fa38368e1 (diff) | |
| parent | 5c3aa4d4121a21f14b44197ceacd43df30febd1c (diff) | |
Merge "Remove MASTER_MONO from replaced settings" into rvc-dev
Diffstat (limited to 'packages/SettingsProvider/src')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index d023d98f2b73..028c3041a50d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -225,8 +225,7 @@ public class SettingsHelper { @VisibleForTesting public boolean isReplacedSystemSetting(String setting) { // This list should not be modified. - if (!Settings.System.MASTER_MONO.equals(setting) - && !Settings.System.SCREEN_OFF_TIMEOUT.equals(setting)) { + if (!Settings.System.SCREEN_OFF_TIMEOUT.equals(setting)) { return false; } // If this flag is set, values for the system settings from the list above have been |