Merge "Remove MASTER_MONO from replaced settings" into rvc-dev am: 951d75d4f8 am: 0234447c34 (a08b5b47) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -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