Merge changes Ia5ccec91,I4854d1a3 into main
* changes:
VmTerminalApp: Migrate Toast to Snackbar
VmTerminalApp: Remove Toast for external storage
diff --git a/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF b/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF
index f4c2a24..6dbabea 100644
--- a/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF
+++ b/build/debian/fai_config/files/etc/systemd/system/forwarder_guest_launcher.service/AVF
@@ -4,7 +4,7 @@
After=network.target
After=virtiofs_internal.service
[Service]
-ExecStart=/usr/bin/bash -c '/usr/local/bin/forwarder_guest_launcher --host 192.168.0.1 --grpc_port $(cat /mnt/internal/debian_service_port)'
+ExecStart=/usr/bin/bash -c 'RUST_LOG=debug /usr/local/bin/forwarder_guest_launcher --host 192.168.0.1 --grpc_port $(cat /mnt/internal/debian_service_port)'
Type=simple
Restart=on-failure
RestartSec=1
diff --git a/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF b/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
index a2516ff..4a32f2b 100644
--- a/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
+++ b/build/debian/fai_config/files/etc/systemd/system/ttyd.service/AVF
@@ -4,7 +4,7 @@
After=network.target
After=virtiofs_internal.service
[Service]
-ExecStart=/usr/local/bin/ttyd --ssl --ssl-cert /etc/ttyd/server.crt --ssl-key /etc/ttyd/server.key --ssl-ca /mnt/internal/ca.crt -W login -f droid
+ExecStart=/usr/local/bin/ttyd --ssl --ssl-cert /etc/ttyd/server.crt --ssl-key /etc/ttyd/server.key --ssl-ca /mnt/internal/ca.crt -t disableLeaveAlert=true -W login -f droid
Type=simple
Restart=always
User=root
diff --git a/build/microdroid/Android.bp b/build/microdroid/Android.bp
index d9e39f0..7f23ae6 100644
--- a/build/microdroid/Android.bp
+++ b/build/microdroid/Android.bp
@@ -139,7 +139,7 @@
],
},
},
- linkerconfig: {
+ linker_config: {
gen_linker_config: true,
linker_config_srcs: ["linker.config.json"],
},
diff --git a/guest/forwarder_guest_launcher/Cargo.toml b/guest/forwarder_guest_launcher/Cargo.toml
index b7f9eaf..03fda56 100644
--- a/guest/forwarder_guest_launcher/Cargo.toml
+++ b/guest/forwarder_guest_launcher/Cargo.toml
@@ -7,6 +7,8 @@
[dependencies]
anyhow = "1.0.91"
clap = { version = "4.5.20", features = ["derive"] }
+env_logger = "0.11.5"
+log = "0.4.22"
prost = "0.13.3"
tokio = { version = "1.40.0", features = ["process", "rt-multi-thread"] }
tonic = "0.12.3"
diff --git a/guest/forwarder_guest_launcher/src/main.rs b/guest/forwarder_guest_launcher/src/main.rs
index d753d19..abb39f6 100644
--- a/guest/forwarder_guest_launcher/src/main.rs
+++ b/guest/forwarder_guest_launcher/src/main.rs
@@ -18,6 +18,7 @@
use clap::Parser;
use debian_service::debian_service_client::DebianServiceClient;
use debian_service::QueueOpeningRequest;
+use log::debug;
use tokio::process::Command;
use tonic::transport::Endpoint;
use tonic::Request;
@@ -41,7 +42,8 @@
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
- println!("Starting forwarder_guest_launcher");
+ env_logger::init();
+ debug!("Starting forwarder_guest_launcher");
let args = Args::parse();
let addr = format!("https://{}:{}", args.host_addr, args.grpc_port);
@@ -58,7 +60,7 @@
.context("Failed to convert guest_tcp_port as i16")?;
let vsock_port = response.vsock_port as u32;
- println!(
+ debug!(
"executing forwarder_guest with guest_tcp_port: {:?}, vsock_port: {:?}",
&tcp_port, &vsock_port
);
diff --git a/libs/debian_service/proto/DebianService.proto b/libs/debian_service/proto/DebianService.proto
index a887bf2..bf05ebe 100644
--- a/libs/debian_service/proto/DebianService.proto
+++ b/libs/debian_service/proto/DebianService.proto
@@ -22,6 +22,7 @@
option java_multiple_files = true;
service DebianService {
+ rpc ReportVmActivePorts (ReportVmActivePortsRequest) returns (ReportVmActivePortsResponse) {}
rpc ReportVmIpAddr (IpAddr) returns (ReportVmIpAddrResponse) {}
rpc OpenForwardingRequestQueue (QueueOpeningRequest) returns (stream ForwardingRequestItem) {}
}
@@ -38,6 +39,14 @@
bool success = 1;
}
+message ReportVmActivePortsRequest {
+ repeated int32 ports = 1;
+}
+
+message ReportVmActivePortsResponse {
+ bool success = 1;
+}
+
message ForwardingRequestItem {
int32 guest_tcp_port = 1;
int32 vsock_port = 2;
diff --git a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
index c64ff77..1f65fcb 100644
--- a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
+++ b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
@@ -26,6 +26,8 @@
import com.android.virtualization.vmlauncher.proto.ForwardingRequestItem;
import com.android.virtualization.vmlauncher.proto.IpAddr;
import com.android.virtualization.vmlauncher.proto.QueueOpeningRequest;
+import com.android.virtualization.vmlauncher.proto.ReportVmActivePortsRequest;
+import com.android.virtualization.vmlauncher.proto.ReportVmActivePortsResponse;
import com.android.virtualization.vmlauncher.proto.ReportVmIpAddrResponse;
import io.grpc.stub.StreamObserver;
@@ -74,6 +76,18 @@
}
@Override
+ public void reportVmActivePorts(
+ ReportVmActivePortsRequest request,
+ StreamObserver<ReportVmActivePortsResponse> responseObserver) {
+ Log.d(DebianServiceImpl.TAG, "reportVmActivePorts: " + request.toString());
+ // TODO(b/340126051): Modify shared preference based on information in the request.
+ ReportVmActivePortsResponse reply =
+ ReportVmActivePortsResponse.newBuilder().setSuccess(true).build();
+ responseObserver.onNext(reply);
+ responseObserver.onCompleted();
+ }
+
+ @Override
public void reportVmIpAddr(
IpAddr request, StreamObserver<ReportVmIpAddrResponse> responseObserver) {
Log.d(DebianServiceImpl.TAG, "reportVmIpAddr: " + request.toString());