Show process name next to port number in port forwarding notification
Bug: 382998551
Test: Run VmTerminalApp
Change-Id: Id7e091e31ac7fa40a9fea0821c0aeff4752cf7f4
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt b/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt
index 7a07dfe..30729c4 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/PortNotifier.kt
@@ -76,7 +76,11 @@
val title = getString(R.string.settings_port_forwarding_notification_title)
val content =
- context.getString(R.string.settings_port_forwarding_notification_content, port)
+ context.getString(
+ R.string.settings_port_forwarding_notification_content,
+ port,
+ portsStateManager.getActivePortInfo(port)?.comm,
+ )
val acceptText = getString(R.string.settings_port_forwarding_notification_accept)
val denyText = getString(R.string.settings_port_forwarding_notification_deny)
val icon = Icon.createWithResource(context, R.drawable.ic_launcher_foreground)
diff --git a/android/TerminalApp/res/values/strings.xml b/android/TerminalApp/res/values/strings.xml
index 10f1bea..d3440d3 100644
--- a/android/TerminalApp/res/values/strings.xml
+++ b/android/TerminalApp/res/values/strings.xml
@@ -114,7 +114,7 @@
<!-- Notification title for a new active port [CHAR LIMIT=none] -->
<string name="settings_port_forwarding_notification_title">Terminal is requesting to open a new port</string>
<!-- Notification content for a new active port [CHAR LIMIT=none] -->
- <string name="settings_port_forwarding_notification_content">Port requested: <xliff:g id="port_number" example="8080">%d</xliff:g></string>
+ <string name="settings_port_forwarding_notification_content">Port requested: <xliff:g id="port_number" example="8000">%1$d</xliff:g> (<xliff:g id="process_name" example="undefined">%2$s</xliff:g>)</string>
<!-- Notification action accept [CHAR LIMIT=16] -->
<string name="settings_port_forwarding_notification_accept">Accept</string>
<!-- Notification action deny [CHAR LIMIT=16] -->