mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-08-07 07:11:06 +00:00
Allow running on Android 5.0 but with a warning that it's unsupported
* The apk targets api level 21 which is 5.0, so it still won't install on anything older. * We pop up a big warning to the user the first time they try and select such a remote host.
This commit is contained in:
@@ -619,9 +619,6 @@ extern "C" RENDERDOC_API ReplayStatus RENDERDOC_CC RENDERDOC_StartAndroidRemoteS
|
||||
|
||||
Android::ExtractDeviceIDAndIndex(device, index, deviceID);
|
||||
|
||||
if(!Android::IsSupported(deviceID))
|
||||
return ReplayStatus::UnknownError;
|
||||
|
||||
std::string packagesOutput = trim(
|
||||
Android::adbExecCommand(deviceID, "shell pm list packages " RENDERDOC_ANDROID_PACKAGE_BASE)
|
||||
.strStdout);
|
||||
|
||||
@@ -142,7 +142,11 @@ bool IsSupported(std::string deviceID)
|
||||
// SDK 23 == Android 6.0, our minimum spec. Only fail if we did parse an SDK string, in case some
|
||||
// Android devices don't support the query - we assume they are new enough.
|
||||
if(apiVersion >= 0 && apiVersion < 23)
|
||||
{
|
||||
RDCWARN("Device '%s' is on api version %d which is not supported",
|
||||
GetFriendlyName(deviceID).c_str(), apiVersion);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -170,7 +174,7 @@ std::string GetFriendlyName(std::string deviceID)
|
||||
combined = manuf + " " + model;
|
||||
|
||||
if(!IsSupported(deviceID))
|
||||
combined += " - Unsupported";
|
||||
combined += " - (Android 5.x)";
|
||||
|
||||
return combined;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user