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

[#3183] Fix Android RD capture layer discovery

Browse Source 
* Installing the Android server on certain devices will not grant
  'force-queryable' permissions, necessary for capture layer
  discovery for API>=30. Reinstalling a second time fixes this
  issue. With this change, the 'force-queryable' attribute is
  checked post-install. If the check fails, it prompts a second
  installtion attempt.
* Solution tested on:
  - OPPO find X6, Android 13 (affected device)
  - Google Pixel 6 and 7, Android 13
  - SM-G930F, Android 8
This commit is contained in:
Tristan Ritchie
2024-01-08 16:04:48 +00:00
committed by Baldur Karlsson
parent 928de11118
commit a7cb486708
1 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+67 -15
View File
@@ -276,6 +276,12 @@ enum class AndroidVersionCheckResult
NotInstalled,
};
enum class AndroidInstallPermissionCheckResult
{
Correct,
NotQueryable,
};
AndroidVersionCheckResult CheckAndroidServerVersion(const rdcstr &deviceID, ABI abi)
{
// assume all servers are updated at the same rate. Only check first ABI's version
@@ -337,6 +343,49 @@ AndroidVersionCheckResult CheckAndroidServerVersion(const rdcstr &deviceID, ABI
return AndroidVersionCheckResult::WrongVersion;
}
Process::ProcessResult InstallAPK(const rdcstr &deviceID, const rdcstr &apk, int apiVersion)
{
Process::ProcessResult adbInstall;
if(apiVersion >= 30)
{
adbInstall = adbExecCommand(deviceID, "install -r -g --force-queryable \"" + apk + "\"");
}
else
{
adbInstall = adbExecCommand(deviceID, "install -r -g \"" + apk + "\"");
}
return adbInstall;
}
AndroidInstallPermissionCheckResult CheckAndroidServerInstallPermissions(const rdcstr &deviceID,
rdcstr packageName,
int apiVersion)
{
// Permissions check only applicable to API > 30
if(apiVersion < 30)
{
return AndroidInstallPermissionCheckResult::Correct;
}
// Command to check that the Android Server is queryable by other APKs (API>30)
// for RenderDoc layer discovery.
Process::ProcessResult adbCheck =
adbExecCommand(deviceID,
"shell \"dumpsys package queries | sed -n '/forceQueryable/,/queries via "
"package name/p' | grep " +
packageName + "\"",
".", true);
// Check the output of 'grep' - no output means no match
if(adbCheck.strStdout.empty())
{
RDCERR("Failed to install with 'force queryable' permissions.");
return AndroidInstallPermissionCheckResult::NotQueryable;
}
return AndroidInstallPermissionCheckResult::Correct;
}
Process::ProcessResult ListPackages(const rdcstr &deviceID, const rdcstr &parameters)
{
Process::ProcessResult result = adbExecCommand(deviceID, "shell getprop ro.build.version.sdk");
@@ -463,15 +512,7 @@ RDResult InstallRenderDocServer(const rdcstr &deviceID)
int apiVersion = atoi(api.c_str());
Process::ProcessResult adbInstall;
if(apiVersion >= 30)
{
adbInstall = adbExecCommand(deviceID, "install -r -g --force-queryable \"" + apk + "\"");
}
else
{
adbInstall = adbExecCommand(deviceID, "install -r -g \"" + apk + "\"");
}
Process::ProcessResult adbInstall = InstallAPK(deviceID, apk, apiVersion);
// if adb produces this message we can be reasonably sure this is a 32-bit version that failed
// to install on a 64-bit only device. However we need to account for the possibility that adb
@@ -487,16 +528,19 @@ RDResult InstallRenderDocServer(const rdcstr &deviceID)
RDCLOG("Installed package '%s', checking for success...", apk.c_str());
AndroidVersionCheckResult check = CheckAndroidServerVersion(deviceID, abi);
AndroidVersionCheckResult versionCheck = CheckAndroidServerVersion(deviceID, abi);
AndroidInstallPermissionCheckResult permissionsCheck =
CheckAndroidServerInstallPermissions(deviceID, GetRenderDocPackageForABI(abi), apiVersion);
if(check != AndroidVersionCheckResult::Correct)
if((versionCheck != AndroidVersionCheckResult::Correct) ||
(permissionsCheck != AndroidInstallPermissionCheckResult::Correct))
{
RDCLOG("Failed to install APK. stdout: %s, stderr: %s",
adbInstall.strStdout.trimmed().c_str(), adbInstall.strStderror.trimmed().c_str());
RDCLOG("Retrying...");
adbExecCommand(deviceID, "install -r \"" + apk + "\"");
InstallAPK(deviceID, apk, apiVersion);
check = CheckAndroidServerVersion(deviceID, abi);
versionCheck = CheckAndroidServerVersion(deviceID, abi);
// if the apk came back as not installed (rather than wrong version code)
// AND it's arm32 in an arm64 environment
@@ -504,14 +548,14 @@ RDResult InstallRenderDocServer(const rdcstr &deviceID)
// AND we're on Android 12
// then we assume that this device is 64-bit only and doesn't support arm32 at all,
// so we ignore the problem
if(check == AndroidVersionCheckResult::NotInstalled && abi == ABI::armeabi_v7a &&
if(versionCheck == AndroidVersionCheckResult::NotInstalled && abi == ABI::armeabi_v7a &&
abis.contains(ABI::arm64_v8a) && result == ResultCode::Succeeded && apiVersion >= 31)
{
RDCWARN(
"ARM32 package failed to install but ARM64 package succeeded. Assuming 64-bit only ARM "
"device and ignoring.");
}
else if(check == AndroidVersionCheckResult::Correct)
else if(versionCheck == AndroidVersionCheckResult::Correct)
{
// if it succeeded this time, then it was the permission grant that failed
result = ResultCode::AndroidGrantPermissionsFailed;
@@ -523,6 +567,14 @@ RDResult InstallRenderDocServer(const rdcstr &deviceID)
// verify the install properly.
result = ResultCode::AndroidAPKVerifyFailed;
}
permissionsCheck =
CheckAndroidServerInstallPermissions(deviceID, GetRenderDocPackageForABI(abi), apiVersion);
if(permissionsCheck != AndroidInstallPermissionCheckResult::Correct)
{
RDCWARN("Failed to verify APK installation permissions after retry.");
result = ResultCode::AndroidAPKVerifyFailed;
}
}
}