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

Add friendlier error if trying to use Android < 6.0 device. Closes #1060

Browse Source
This commit is contained in:
baldurk
2018-07-31 14:37:38 +01:00
parent 5293a2c991
commit df1a494fa7
5 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+13
View File
@@ -587,6 +587,16 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_AndroidShutdown()
Android::shutdownAdb();
}
extern "C" RENDERDOC_API bool RENDERDOC_CC RENDERDOC_IsAndroidSupported(const char *device)
{
int index = 0;
std::string deviceID;
Android::ExtractDeviceIDAndIndex(device, index, deviceID);
return Android::IsSupported(deviceID);
}
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_StartAndroidRemoteServer(const char *device)
{
int index = 0;
@@ -594,6 +604,9 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_StartAndroidRemoteServer(co
Android::ExtractDeviceIDAndIndex(device, index, deviceID);
if(!Android::IsSupported(deviceID))
return;
std::string packagesOutput = trim(
Android::adbExecCommand(deviceID, "shell pm list packages " RENDERDOC_ANDROID_PACKAGE_BASE)
.strStdout);