Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove MASTER_MONO from replaced settings" into rvc-dev am: 951d75d4f8 am: 0234447c34 am: a08b5b473b

Browse Source 
Change-Id: I53783e71d08cb4e6f34c15af3dd89d46a00c5082
This commit is contained in:
Ruslan Tkhakokhov
2020-05-05 12:42:21 +00:00
committed by Automerger Merge Worker
parent 539529c4f5 a08b5b473b
commit 9b6ce381f4
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
View File

@@ -225,8 +225,7 @@ public class SettingsHelper {
@VisibleForTesting @VisibleForTesting
public boolean isReplacedSystemSetting(String setting) { public boolean isReplacedSystemSetting(String setting) {
// This list should not be modified. // This list should not be modified.
if (!Settings.System.MASTER_MONO.equals(setting) if (!Settings.System.SCREEN_OFF_TIMEOUT.equals(setting)) {
&& !Settings.System.SCREEN_OFF_TIMEOUT.equals(setting)) {
return false; return false;
} }
// If this flag is set, values for the system settings from the list above have been // If this flag is set, values for the system settings from the list above have been