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

Commit 1c1a7b4c authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 996b2f37 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24298921



Change-Id: I6625f1042751a870388fe516c7927ce8069d431e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7dd10dd9 996b2f37

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

+13 −4
Original line number Diff line number Diff line
@@ -3229,6 +3229,15 @@ public class SettingsProvider extends ContentProvider { 
            return settingsState.getSettingLocked(name);

        }



        private static boolean shouldExcludeSettingFromReset(Setting setting, String prefix) {

            // If a prefix was specified, exclude settings whose names don't start with it.

            if (prefix != null && !setting.getName().startsWith(prefix)) {

                return true;

            }

            // Never reset SECURE_FRP_MODE, as it could be abused to bypass FRP via RescueParty.

            return Global.SECURE_FRP_MODE.equals(setting.getName());

        }



        public void resetSettingsLocked(int type, int userId, String packageName, int mode,

                String tag) {

            resetSettingsLocked(type, userId, packageName, mode, tag, /*prefix=*/
@@ -3251,7 +3260,7 @@ public class SettingsProvider extends ContentProvider { 
                        Setting setting = settingsState.getSettingLocked(name);

                        if (packageName.equals(setting.getPackageName())) {

                            if ((tag != null && !tag.equals(setting.getTag()))

                                    || (prefix != null && !setting.getName().startsWith(prefix))) {

                                    || shouldExcludeSettingFromReset(setting, prefix)) {

                                continue;

                            }

                            if (settingsState.resetSettingLocked(name)) {
@@ -3272,7 +3281,7 @@ public class SettingsProvider extends ContentProvider { 
                        Setting setting = settingsState.getSettingLocked(name);

                        if (!SettingsState.isSystemPackage(getContext(),

                                setting.getPackageName())) {

                            if (prefix != null && !setting.getName().startsWith(prefix)) {

                            if (shouldExcludeSettingFromReset(setting, prefix)) {

                                continue;

                            }

                            if (settingsState.resetSettingLocked(name)) {
@@ -3293,7 +3302,7 @@ public class SettingsProvider extends ContentProvider { 
                        Setting setting = settingsState.getSettingLocked(name);

                        if (!SettingsState.isSystemPackage(getContext(),

                                setting.getPackageName())) {

                            if (prefix != null && !setting.getName().startsWith(prefix)) {

                            if (shouldExcludeSettingFromReset(setting, prefix)) {

                                continue;

                            }

                            if (setting.isDefaultFromSystem()) {
@@ -3318,7 +3327,7 @@ public class SettingsProvider extends ContentProvider { 
                    for (String name : settingsState.getSettingNamesLocked()) {

                        Setting setting = settingsState.getSettingLocked(name);

                        boolean someSettingChanged = false;

                        if (prefix != null && !setting.getName().startsWith(prefix)) {

                        if (shouldExcludeSettingFromReset(setting, prefix)) {

                            continue;

                        }

                        if (setting.isDefaultFromSystem()) {

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

+25 −0
Original line number Diff line number Diff line
@@ -464,6 +464,31 @@ public class SettingsProviderTest extends BaseSettingsProviderTest { 
        }

    }



    // To prevent FRP bypasses, the SECURE_FRP_MODE setting should not be reset when all other

    // settings are reset.  But it should still be possible to explicitly set its value.

    @Test

    public void testSecureFrpModeSettingCannotBeReset() throws Exception {

        final String name = Settings.Global.SECURE_FRP_MODE;

        final String origValue = getSetting(SETTING_TYPE_GLOBAL, name);

        setSettingViaShell(SETTING_TYPE_GLOBAL, name, "1", false);

        try {

            assertEquals("1", getSetting(SETTING_TYPE_GLOBAL, name));

            for (int type : new int[] { SETTING_TYPE_GLOBAL, SETTING_TYPE_SECURE }) {

                resetSettingsViaShell(type, Settings.RESET_MODE_UNTRUSTED_DEFAULTS);

                resetSettingsViaShell(type, Settings.RESET_MODE_UNTRUSTED_CHANGES);

                resetSettingsViaShell(type, Settings.RESET_MODE_TRUSTED_DEFAULTS);

            }

            // The value should still be "1".  It should not have been reset to null.

            assertEquals("1", getSetting(SETTING_TYPE_GLOBAL, name));

            // It should still be possible to explicitly set the value to "0".

            setSettingViaShell(SETTING_TYPE_GLOBAL, name, "0", false);

            assertEquals("0", getSetting(SETTING_TYPE_GLOBAL, name));

        } finally {

            setSettingViaShell(SETTING_TYPE_GLOBAL, name, origValue, false);

            assertEquals(origValue, getSetting(SETTING_TYPE_GLOBAL, name));

        }

    }



    private void doTestQueryStringInBracketsViaProviderApiForType(int type) {

        // Make sure we have a clean slate.

        deleteStringViaProviderApi(type, FAKE_SETTING_NAME);