Remove ip address reporting feature
Bug: 373533555
Test: run terminal
Change-Id: I924b80737abd686f620377f32f3400a2954b62ff
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java b/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java
index 9cf6093..9a97a52 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/DebianServiceImpl.java
@@ -25,11 +25,9 @@
import com.android.virtualization.terminal.proto.DebianServiceGrpc;
import com.android.virtualization.terminal.proto.ForwardingRequestItem;
-import com.android.virtualization.terminal.proto.IpAddr;
import com.android.virtualization.terminal.proto.QueueOpeningRequest;
import com.android.virtualization.terminal.proto.ReportVmActivePortsRequest;
import com.android.virtualization.terminal.proto.ReportVmActivePortsResponse;
-import com.android.virtualization.terminal.proto.ReportVmIpAddrResponse;
import com.android.virtualization.terminal.proto.ShutdownQueueOpeningRequest;
import com.android.virtualization.terminal.proto.ShutdownRequestItem;
@@ -42,16 +40,14 @@
private final Context mContext;
private final PortsStateManager mPortsStateManager;
private PortsStateManager.Listener mPortsStateListener;
- private final DebianServiceCallback mCallback;
private Runnable mShutdownRunnable;
static {
System.loadLibrary("forwarder_host_jni");
}
- DebianServiceImpl(Context context, DebianServiceCallback callback) {
+ DebianServiceImpl(Context context) {
super();
- mCallback = callback;
mContext = context;
mPortsStateManager = PortsStateManager.getInstance(mContext);
}
@@ -69,16 +65,6 @@
}
@Override
- public void reportVmIpAddr(
- IpAddr request, StreamObserver<ReportVmIpAddrResponse> responseObserver) {
- Log.d(TAG, "reportVmIpAddr: " + request.toString());
- mCallback.onIpAddressAvailable(request.getAddr());
- ReportVmIpAddrResponse reply = ReportVmIpAddrResponse.newBuilder().setSuccess(true).build();
- responseObserver.onNext(reply);
- responseObserver.onCompleted();
- }
-
- @Override
public void openForwardingRequestQueue(
QueueOpeningRequest request, StreamObserver<ForwardingRequestItem> responseObserver) {
Log.d(TAG, "OpenForwardingRequestQueue");
@@ -160,8 +146,4 @@
.mapToInt(Integer::intValue)
.toArray());
}
-
- protected interface DebianServiceCallback {
- void onIpAddressAvailable(String ipAddr);
- }
}
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index 3fea0dc..4fddd14 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -403,11 +403,6 @@
}
@Override
- public void onIpAddrAvailable(String ipAddr) {
- // TODO: remove this
- }
-
- @Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.main_menu, menu);
return true;
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
index f83e0f7..09b58d3 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.java
@@ -61,7 +61,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-public class VmLauncherService extends Service implements DebianServiceImpl.DebianServiceCallback {
+public class VmLauncherService extends Service {
private static final String EXTRA_NOTIFICATION = "EXTRA_NOTIFICATION";
private static final String ACTION_START_VM_LAUNCHER_SERVICE =
"android.virtualization.START_VM_LAUNCHER_SERVICE";
@@ -72,8 +72,6 @@
private static final int RESULT_START = 0;
private static final int RESULT_STOP = 1;
private static final int RESULT_ERROR = 2;
- private static final int RESULT_IPADDR = 3;
- private static final String KEY_VM_IP_ADDR = "ip_addr";
private ExecutorService mExecutorService;
private VirtualMachine mVirtualMachine;
@@ -92,8 +90,6 @@
void onVmStop();
void onVmError();
-
- void onIpAddrAvailable(String ipAddr);
}
public static void run(
@@ -119,9 +115,6 @@
case RESULT_ERROR:
callback.onVmError();
return;
- case RESULT_IPADDR:
- callback.onIpAddrAvailable(resultData.getString(KEY_VM_IP_ADDR));
- return;
}
}
};
@@ -317,7 +310,7 @@
try {
// TODO(b/372666638): gRPC for java doesn't support vsock for now.
int port = 0;
- mDebianService = new DebianServiceImpl(this, this);
+ mDebianService = new DebianServiceImpl(this);
mServer =
OkHttpServerBuilder.forPort(port, InsecureServerCredentials.create())
.intercept(interceptor)
@@ -342,14 +335,6 @@
});
}
- @Override
- public void onIpAddressAvailable(String ipAddr) {
- android.os.Trace.endAsyncSection("debianBoot", 0);
- Bundle b = new Bundle();
- b.putString(VmLauncherService.KEY_VM_IP_ADDR, ipAddr);
- mResultReceiver.send(VmLauncherService.RESULT_IPADDR, b);
- }
-
public static void stop(Context context) {
Intent i = getMyIntent(context);
i.setAction(VmLauncherService.ACTION_STOP_VM_LAUNCHER_SERVICE);
diff --git a/libs/debian_service/proto/DebianService.proto b/libs/debian_service/proto/DebianService.proto
index 739f0ac..60f20d4 100644
--- a/libs/debian_service/proto/DebianService.proto
+++ b/libs/debian_service/proto/DebianService.proto
@@ -23,7 +23,6 @@
service DebianService {
rpc ReportVmActivePorts (ReportVmActivePortsRequest) returns (ReportVmActivePortsResponse) {}
- rpc ReportVmIpAddr (IpAddr) returns (ReportVmIpAddrResponse) {}
rpc OpenForwardingRequestQueue (QueueOpeningRequest) returns (stream ForwardingRequestItem) {}
rpc OpenShutdownRequestQueue (ShutdownQueueOpeningRequest) returns (stream ShutdownRequestItem) {}
}
@@ -32,14 +31,6 @@
int32 cid = 1;
}
-message IpAddr {
- string addr = 1;
-}
-
-message ReportVmIpAddrResponse {
- bool success = 1;
-}
-
message ReportVmActivePortsRequest {
repeated int32 ports = 1;
}
@@ -55,4 +46,4 @@
message ShutdownQueueOpeningRequest {}
-message ShutdownRequestItem {}
\ No newline at end of file
+message ShutdownRequestItem {}