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

Commit 67c3fa30 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov
Browse files

Do not preserve settings changed by 'android' package 

Bug: 144838882
Test: atest SettingsProviderTest:SettingsStateTest

System reinitialises some settings to the same value after reboot (e.g.
bluetooth_on, accessibility_enabled, font_scale). Such modifications
shouldn't set isPreserved flag.

Change-Id: Ib929bf7d544b78202691eff3ae2ac75f2c209aa2
parent 894385e6

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

+8 −2
Original line number Diff line number Diff line
@@ -1313,7 +1313,8 @@ final class SettingsState { 
            }



            // isValuePreservedInRestore shouldn't change back to false if it has been set to true.

            boolean isPreserved = shouldPreserveSetting(overrideableByRestore, resetToDefault);

            boolean isPreserved = shouldPreserveSetting(overrideableByRestore, resetToDefault,

                    packageName, value);



            // Is something gonna change?

            if (Objects.equals(value, this.value)
@@ -1339,11 +1340,16 @@ final class SettingsState { 
        }



        private boolean shouldPreserveSetting(boolean overrideableByRestore,

                boolean resetToDefault) {

                boolean resetToDefault, String packageName, String value) {

            if (resetToDefault) {

                // By default settings are not marked as preserved.

                return false;

            }

            if (value != null && value.equals(this.value)

                    && SYSTEM_PACKAGE_NAME.equals(packageName)) {

                // Do not mark preserved if it's the system reinitializing to the same value.

                return false;

            }



            // isValuePreservedInRestore shouldn't change back to false if it has been set to true.

            return this.isValuePreservedInRestore || !overrideableByRestore;

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java

+21 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public class SettingsStateTest extends AndroidTestCase { 
            "日本語";



    private static final String TEST_PACKAGE = "package";

    private static final String SYSTEM_PACKAGE = "android";

    private static final String SETTING_NAME = "test_setting";



    private final Object mLock = new Object();
@@ -253,6 +254,26 @@ public class SettingsStateTest extends AndroidTestCase { 


    }



    public void testModifySettingBySystemPackage_sameValue_preserveFlagNotSet() {

        SettingsState settingsState = getSettingStateObject();

        // Initialize the setting.

        settingsState.insertSettingLocked(SETTING_NAME, "1", null, false, SYSTEM_PACKAGE);

        // Update the setting.

        settingsState.insertSettingLocked(SETTING_NAME, "1", null, false, SYSTEM_PACKAGE);



        assertFalse(settingsState.getSettingLocked(SETTING_NAME).isValuePreservedInRestore());

    }



    public void testModifySettingBySystemPackage_newValue_preserveFlagSet() {

        SettingsState settingsState = getSettingStateObject();

        // Initialize the setting.

        settingsState.insertSettingLocked(SETTING_NAME, "1", null, false, SYSTEM_PACKAGE);

        // Update the setting.

        settingsState.insertSettingLocked(SETTING_NAME, "2", null, false, SYSTEM_PACKAGE);



        assertTrue(settingsState.getSettingLocked(SETTING_NAME).isValuePreservedInRestore());

    }



    private SettingsState getSettingStateObject() {

        SettingsState settingsState = new SettingsState(getContext(), mLock, mSettingsFile, 1,

                SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper());