From 0b1501a7c8965236e93bd47b45d5dfc0767d5c41 Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Wed, 4 Jan 2017 17:08:15 -0800 Subject: [PATCH] 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 --- .../com/android/providers/settings/SettingsService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java index 6b01d6687c653..fecc938ad3be0 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java @@ -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 - " - + "doesn't apply to system settings"); + 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 {