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

Commit b68bb548 authored by Biswarup Pal's avatar Biswarup Pal
Browse files

Fix SettingsProviderTest 

ag/33400265 had added the explicit passing of UserHandle.SYSTEM
as the default userId during "put" calls via shell, but not during
"reset" calls. When userId is not present in shell command, settings
service falls back to the current user. As a result, tests which
call "put" and "reset" end up affecting different userIds in HSUM
devices. This change fixes that by not passing any default userId
during "put" calls via shell.

Flag: EXEMPT test fix
Fixes: 415912406
Test: atest SettingsProviderTest
Change-Id: I5a01daa8defa3fcbc99c4471804f959dbd8a76f4
parent 67dc8e82

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

+12 −15
Original line number Diff line number Diff line
@@ -326,42 +326,39 @@ abstract class BaseSettingsProviderTest { 


    protected static void setSettingViaShell(int type, String name, String value,

            String token, boolean makeDefault) throws IOException {

        setSettingViaShell(type, name, value, token, makeDefault, UserHandle.USER_SYSTEM,

        setSettingViaShell(type, name, value, token, makeDefault, null /* user */,

                Context.DEVICE_ID_DEFAULT);

    }



    protected static void setSettingViaShell(int type, String name, String value,

            int userId, int deviceId) throws Exception {

        setSettingViaShell(type, name, value, null /* token */, true /* makeDefault */, userId,

                deviceId);

        setSettingViaShell(type, name, value, null /* token */, true /* makeDefault */,

                String.valueOf(userId), deviceId);

    }



    protected static void setSettingViaShell(int type, String name, String value,

            String token, boolean makeDefault, int userId, int deviceId) throws IOException {

    private static void setSettingViaShell(int type, String name, String value,

            String token, boolean makeDefault, String user, int deviceId) throws IOException {

        String settingType;

        switch (type) {

            case SETTING_TYPE_GLOBAL: {

                executeShellCommand("settings put --user " + userId + " --deviceId " + deviceId

                        + " global " + name + " " + value + (token != null ? " " + token : "")

                        + (makeDefault ? " default" : ""));



                settingType = "global";

            } break;



            case SETTING_TYPE_SECURE: {

                executeShellCommand("settings put --user " + userId + " --deviceId " + deviceId

                        + " secure " + name + " " + value + (token != null ? " " + token : "")

                        + (makeDefault ? " default" : ""));

                settingType = "secure";

            } break;



            case SETTING_TYPE_SYSTEM: {

                executeShellCommand("settings put --user " + userId + " --deviceId " + deviceId

                        + " system " + name + " " + value + (token != null ? " " + token : "")

                        + (makeDefault ? " default" : ""));

                settingType = "system";

            } break;



            default: {

                throw new IllegalArgumentException("Invalid type: " + type);

            }

        }

        executeShellCommand("settings put" + (user != null ? (" --user " + user) : "")

                + " --deviceId " + deviceId + " " + settingType + " " + name + " " + value

                + (token != null ? " " + token : "") + (makeDefault ? " default" : ""));

    }



    protected Context getContext() {