| commit | 741c3d98fc49f1ff11df80e9ae60e5f8a60b5863 | [log] [tgz] |
|---|---|---|
| author | Seungjae Yoo <seungjaeyoo@google.com> | Tue Nov 26 07:45:48 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 26 07:45:48 2024 +0000 |
| tree | 4702c962dd179698fc74679752f2834a64c90262 | |
| parent | 39cd2ac41ad8c9bf2625486179ec9e74dcb143b5 [diff] | |
| parent | f5079e9a1ad8d396bb94c0f3d56bb953344f708c [diff] |
Merge "Sort ports in SettingsPortForwardingActivity" into main am: f5079e9a1a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3375190 Change-Id: I19136948e5d204e9c8a08fd3c1df89c4af414e8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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,