Merge "Sort properties by keys"

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
index 1e75fe70becd..fdbbc391082f 100644
--- 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 {