lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 10:00:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

clarify logic around retry to avoid unecessary adb traffic

Browse Source 
Change-Id: I8e2a4d4255e9959579a06f839301434e1e104c2f
This commit is contained in:
Tristan Ritchie
2024-01-10 10:31:05 +00:00
committed by Baldur Karlsson
parent a7cb486708
commit 4effbfaca1
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+12 -6
View File
@@ -362,7 +362,7 @@ AndroidInstallPermissionCheckResult CheckAndroidServerInstallPermissions(const r
rdcstr packageName,
int apiVersion)
{
// Permissions check only applicable to API > 30
// Permissions check only applicable to API >= 30
if(apiVersion < 30)
{
return AndroidInstallPermissionCheckResult::Correct;
@@ -528,12 +528,18 @@ RDResult InstallRenderDocServer(const rdcstr &deviceID)
RDCLOG("Installed package '%s', checking for success...", apk.c_str());
bool retryNeeded;
AndroidVersionCheckResult versionCheck = CheckAndroidServerVersion(deviceID, abi);
AndroidInstallPermissionCheckResult permissionsCheck =
CheckAndroidServerInstallPermissions(deviceID, GetRenderDocPackageForABI(abi), apiVersion);
retryNeeded = (versionCheck != AndroidVersionCheckResult::Correct);
if((versionCheck != AndroidVersionCheckResult::Correct) ||
(permissionsCheck != AndroidInstallPermissionCheckResult::Correct))
if(!retryNeeded)
{
AndroidInstallPermissionCheckResult permissionsCheck =
CheckAndroidServerInstallPermissions(deviceID, GetRenderDocPackageForABI(abi), apiVersion);
retryNeeded = (permissionsCheck != AndroidInstallPermissionCheckResult::Correct);
}
if(retryNeeded)
{
RDCLOG("Failed to install APK. stdout: %s, stderr: %s",
adbInstall.strStdout.trimmed().c_str(), adbInstall.strStderror.trimmed().c_str());
@@ -568,7 +574,7 @@ RDResult InstallRenderDocServer(const rdcstr &deviceID)
result = ResultCode::AndroidAPKVerifyFailed;
}
permissionsCheck =
AndroidInstallPermissionCheckResult permissionsCheck =
CheckAndroidServerInstallPermissions(deviceID, GetRenderDocPackageForABI(abi), apiVersion);
if(permissionsCheck != AndroidInstallPermissionCheckResult::Correct)
{