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

Commit 2b8dfa11 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Warn makeDefault ignored for system settings only if true"

parents 9569ea0b 0b1501a7

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 {