Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c3aa4d4 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov
Browse files

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
parent 10f48bb6

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