summaryrefslogtreecommitdiffstats
path: root/adbconnection/adbconnection.cc
diff options
context:
space:
mode:
authorAlex Light <allight@google.com>2018-02-23 15:25:45 -0800
committerAlex Light <allight@google.com>2018-04-19 10:30:50 -0700
commitf889c70e79643373320f5742cc719d6c467531b9 (patch)
treeada543c87521fbfd98bbbe0004ca9e89c36a9489 /adbconnection/adbconnection.cc
parent740a50992ea1a200068eb4486a172a151c9b329c (diff)
downloadplatform_art-f889c70e79643373320f5742cc719d6c467531b9.tar.gz
platform_art-f889c70e79643373320f5742cc719d6c467531b9.tar.bz2
platform_art-f889c70e79643373320f5742cc719d6c467531b9.zip
Always allow agent attach on userdebug builds with kArtTiVersion
We added support for the jvmti-alike ArtTi for use by debuggers on userdebug/eng builds of android. Extend this support to allow any agent to be loaded on any process of a userdebug device. These agents will need to make use of kArtTiVersion (0x70010200) envs. Test: build Test: ./test.py --host -j50 Test: ensure AS profiler continues to work with userdebug devices Bug: 78195998 Change-Id: I984d1ea937eb49afb376a48bea3d67085192020e
Diffstat (limited to 'adbconnection/adbconnection.cc')
-rw-r--r--adbconnection/adbconnection.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/adbconnection/adbconnection.cc b/adbconnection/adbconnection.cc
index ee89717043a..3c5f735b344 100644
--- a/adbconnection/adbconnection.cc
+++ b/adbconnection/adbconnection.cc
@@ -837,8 +837,7 @@ void AdbConnectionState::AttachJdwpAgent(art::Thread* self) {
self->AssertNoPendingException();
runtime->AttachAgent(/* JNIEnv */ nullptr,
MakeAgentArg(),
- /* classloader */ nullptr,
- /*allow_non_debuggable_tooling*/ true);
+ /* classloader */ nullptr);
if (self->IsExceptionPending()) {
LOG(ERROR) << "Failed to load agent " << agent_name_;
art::ScopedObjectAccess soa(self);