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

Remove MASTER_MONO from replaced settings

Browse Source 
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
This commit is contained in:
Ruslan Tkhakokhov
2020-04-30 22:24:06 +01:00
parent 10f48bb6ab
commit 5c3aa4d412
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
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