summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabien Sanglard <sanglardf@google.com> 2023-06-30 00:14:45 +0000
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-06-30 09:28:15 +0000
commitacc70d3d37fdf314b6ad157aafd9f79cd8e0fb62 (patch)
tree52aaedf434c14f42e8dfcee96ae0600f6a790ca1
parent919e0141844f50903303bb04cf496558b58a3c97 (diff)
Delete dead code
Test: NA Bug: NA Change-Id: I5044909883053dc47726ef6d3d1702995115c556
-rw-r--r--adbconnection/adbconnection.cc5
-rw-r--r--adbconnection/adbconnection.h16
2 files changed, 7 insertions, 14 deletions
diff --git a/adbconnection/adbconnection.cc b/adbconnection/adbconnection.cc
index 4759bed768..82e57af536 100644
--- a/adbconnection/adbconnection.cc
+++ b/adbconnection/adbconnection.cc
@@ -30,6 +30,7 @@
#include "adbconnection/client.h"
#include "android-base/endian.h"
#include "android-base/stringprintf.h"
+#include "android-base/unique_fd.h"
#include "art_field-inl.h"
#include "art_method-alloc-inl.h"
#include "base/file_utils.h"
@@ -483,10 +484,6 @@ void AdbConnectionState::SendAgentFds(bool require_handshake) {
}
}
-android::base::unique_fd AdbConnectionState::ReadFdFromAdb() {
- return android::base::unique_fd(adbconnection_client_receive_jdwp_fd(control_ctx_.get()));
-}
-
bool AdbConnectionState::SetupAdbConnection() {
int sleep_ms = 500;
const int sleep_max_ms = 2 * 1000;
diff --git a/adbconnection/adbconnection.h b/adbconnection/adbconnection.h
index 6500b79164..63235b24e0 100644
--- a/adbconnection/adbconnection.h
+++ b/adbconnection/adbconnection.h
@@ -17,22 +17,20 @@
#ifndef ART_ADBCONNECTION_ADBCONNECTION_H_
#define ART_ADBCONNECTION_ADBCONNECTION_H_
+#include <jni.h>
#include <stdint.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <limits>
#include <memory>
#include <vector>
-#include <limits>
-#include "android-base/unique_fd.h"
#include "adbconnection/client.h"
-
-#include "base/mutex.h"
#include "base/array_ref.h"
+#include "base/mutex.h"
#include "runtime_callbacks.h"
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <jni.h>
-
namespace adbconnection {
static constexpr char kJdwpControlName[] = "\0jdwp-control";
@@ -103,8 +101,6 @@ class AdbConnectionState {
std::string MakeAgentArg();
- android::base::unique_fd ReadFdFromAdb();
-
void SendAgentFds(bool require_handshake);
void CloseFds();