lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-31 03:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fail sooner if package fails to start completely

Browse Source 
* This may be due to bad intent args
This commit is contained in:
baldurk
2019-11-19 23:20:56 +00:00
parent 13f796a0ef
commit dd89430895
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+12 -7
View File
@@ -1072,13 +1072,6 @@ ExecuteResult AndroidRemoteServer::ExecuteAndInject(const char *a, const char *w
Android::adbExecCommand(
m_deviceID, StringFormat::Fmt("shell am start -S -D -n %s/%s %s", packageName.c_str(),
activityName.c_str(), intentArgs.c_str()));
// adb shell ps | grep $PACKAGE | awk '{print $2}')
pid = Android::GetCurrentPID(m_deviceID, packageName);
if(pid == 0)
RDCERR("Couldn't get PID when launching %s with activity %s", packageName.c_str(),
activityName.c_str());
}
else
{
@@ -1093,6 +1086,18 @@ ExecuteResult AndroidRemoteServer::ExecuteAndInject(const char *a, const char *w
jdwpPort = 0;
}
// adb shell ps | grep $PACKAGE | awk '{print $2}')
pid = Android::GetCurrentPID(m_deviceID, packageName);
if(pid == 0)
{
RDCERR("Couldn't get PID when launching %s with activity %s and intent args %s",
packageName.c_str(), activityName.c_str(), intentArgs.c_str());
ret.status = ReplayStatus::InjectionFailed;
ret.ident = 0;
return;
}
Android::adbForwardPorts(m_portbase, m_deviceID, jdwpPort, pid, false);
// sleep a little to let the ports initialise