diff options
| author | Ruslan Tkhakokhov <rthakohov@google.com> | 2020-04-30 22:24:06 +0100 |
|---|---|---|
| committer | Ruslan Tkhakokhov <rthakohov@google.com> | 2020-04-30 21:28:40 +0000 |
| commit | 5c3aa4d4121a21f14b44197ceacd43df30febd1c (patch) | |
| tree | 5ac97cc1684bbd299edbf2ab1818b4c1050e3434 /packages/SettingsProvider/src | |
| parent | 10f48bb6ab367f6e87caed78816838f47318ea9e (diff) | |
Remove MASTER_MONO from replaced settings
Bug: 153940088
Test: build
In ag/11078633 we added logic for special-casing B&R of temporarily
replaced system settings. Remove Settings.System.MASTER_MONO from that list as
it won't be replaced anymore.
Change-Id: I27e519c58b9d621465c882d8ed2532bfda884d02
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 |