From 7bb27de066c5ffcd90395cea639bde192dbe226c Mon Sep 17 00:00:00 2001
From: Linus Tufvesson <lus@google.com>
Date: Thu, 21 Nov 2019 12:02:02 +0000
Subject: [PATCH] Sort properties by keys

'device_config list' is printing the values sorted
'device_config list <namespace>' should do the same.

Test: Manually verified
Change-Id: I6b1f65161e56f5299a74b7c0942cef3a4d16d3d9
---
 .../com/android/providers/settings/DeviceConfigService.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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