commit de190c82482dec7d63e2c4e61498682e1280818e
author Seungjae Yoo <seungjaeyoo@google.com> Tue Nov 26 08:30:13 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 26 08:30:13 2024 +0000
tree 1540a6bf41453396a2c345ff6bd5b92b40632fc9
parent ba0b569c427644e5ffd5b16dc25a70b403afae0c
parent 741c3d98fc49f1ff11df80e9ae60e5f8a60b5863

Merge "Sort ports in SettingsPortForwardingActivity" into main am: f5079e9a1a am: 741c3d98fc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3375190

Change-Id: Ie148915848bc2a1c312e4ba5c82e365594d38cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt

diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
index 1b39ff0..a332a9d 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
@@ -47,7 +47,7 @@
                 HashSet<String>()
             )
 
-        for (port in ports!!) {
+        for (port in ports!!.sortedWith(compareBy( { it.toInt() } ))) {
             val enabled =
                 sharedPref.getBoolean(
                     getString(R.string.preference_forwarding_port_is_enabled) + port,