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

Commit 0b1501a7 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Warn makeDefault ignored for system settings only if true 

Test: changed system setting and got it back without a warning

bug:33816118

Change-Id: I4e185b46467fc885d2bafedbcbdf41354d0fa9d8
parent ab156196

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

+5 −3
Original line number Diff line number Diff line
@@ -355,9 +355,11 @@ final public class SettingsService extends Binder { 
            final String callPutCommand;

            if ("system".equals(table)) {

                callPutCommand = Settings.CALL_METHOD_PUT_SYSTEM;

                makeDefault = false;

                getOutPrintWriter().println("Ignored makeDefault - "

                if (makeDefault) {

                    getOutPrintWriter().print("Ignored makeDefault - "

                            + "doesn't apply to system settings");

                    makeDefault = false;

                }

            } else if ("secure".equals(table)) callPutCommand = Settings.CALL_METHOD_PUT_SECURE;

            else if ("global".equals(table)) callPutCommand = Settings.CALL_METHOD_PUT_GLOBAL;

            else {