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

Commit 7d866818 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

Merge "Remove MASTER_MONO from replaced settings" into rvc-dev am: 951d75d4 

Change-Id: I2bbf636226d36389d2ea9f1fd513c36b30244e2e
parents fb573b8b 951d75d4

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