From 5c3aa4d4121a21f14b44197ceacd43df30febd1c Mon Sep 17 00:00:00 2001 From: Ruslan Tkhakokhov Date: Thu, 30 Apr 2020 22:24:06 +0100 Subject: [PATCH] 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 --- .../src/com/android/providers/settings/SettingsHelper.java | 3 +-- 1 file changed, 1 insertion(+), 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 d023d98f2b734..028c3041a50dd 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