Merge "Sort properties by keys"

2019-11-21 16:46:22 +00:00
parent e155ed48fa 7bb27de066
commit b43913461c
1 changed files with 3 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
@@ -196,7 +196,9 @@ public final class DeviceConfigService extends Binder {
                case LIST:
                    if (namespace != null) {
                        DeviceConfig.Properties properties = DeviceConfig.getProperties(namespace);
-                        for (String name : properties.getKeyset()) {
+                        List<String> keys = new ArrayList<>(properties.getKeyset());
+                        Collections.sort(keys);
+                        for (String name : keys) {
                            pout.println(name + "=" + properties.getString(name, null));
                        }
                    } else {