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

Return ReplayStatus when launching/injecting, use to indicate JDWP error

Browse Source 
* If android studio or other android tools are open when a package is
  launched for debugging, they greedily jump on it and connect which
  prevents us from connecting.
This commit is contained in:
baldurk
2018-02-20 11:54:57 +00:00
parent 6a1db5deac
commit 13c1cf6ad4
17 changed files with 206 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+13 -5
View File
@@ -122,13 +122,17 @@ int GetCurrentPID(const std::string &deviceID, const std::string &packageName)
return 0;
}
uint32_t StartAndroidPackageForCapture(const char *host, const char *package,
const CaptureOptions &opts)
ExecuteResult StartAndroidPackageForCapture(const char *host, const char *package,
const CaptureOptions &opts)
{
int index = 0;
std::string deviceID;
Android::ExtractDeviceIDAndIndex(host, index, deviceID);
ExecuteResult ret;
ret.status = ReplayStatus::UnknownError;
ret.ident = RenderDoc_FirstTargetControlPort + RenderDoc_AndroidPortOffset * (index + 1);
string packageName = basename(string(package)); // Remove leading '/' if any
// adb shell cmd package resolve-activity -c android.intent.category.LAUNCHER com.jake.cube1
@@ -211,21 +215,25 @@ uint32_t StartAndroidPackageForCapture(const char *host, const char *package,
if(!injected)
{
RDCERR("Failed to inject using JDWP");
return 0;
ret.status = ReplayStatus::JDWPFailure;
ret.ident = 0;
return ret;
}
}
uint32_t ret = RenderDoc_FirstTargetControlPort + RenderDoc_AndroidPortOffset * (index + 1);
ret.status = ReplayStatus::InjectionFailed;
uint32_t elapsed = 0,
timeout = 1000 *
RDCMAX(5, atoi(RenderDoc::Inst().GetConfigSetting("MaxConnectTimeout").c_str()));
while(elapsed < timeout)
{
// Check if the target app has started yet and we can connect to it.
ITargetControl *control = RENDERDOC_CreateTargetControl(host, ret, "testConnection", false);
ITargetControl *control = RENDERDOC_CreateTargetControl(host, ret.ident, "testConnection", false);
if(control)
{
control->Shutdown();
ret.status = ReplayStatus::Succeeded;
break;
}