Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-05 02:36:04 +00:00
committed by Android (Google) Code Review
parent 9569ea0b93 0b1501a7c8
commit 2b8dfa1127
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java
View File

@@ -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 {