izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[INTEGRATE] Change 2418497 by Robert.Jones@Pitbull-RJones on 2015/01/26 06:46:00

Browse Source 
UE-8075 - Devices not updating post-SDK path change
	Fixed code so that it correctly references the device detection class.
	Added a 'force update' path so that upon successful SDK path updates the devices are rechecked right away instead of waiting up to 10 seconds.
	Cleared out old devices if the SDK path is empty/doesn't contain the adb executable

	Change to UEBuildAndroid so that empty SDK paths are no longer treated as valid paths on start up allowing things like SDKPath=("") to be overridden by env vars.

[CL 2419718 by Ben Marsh in Main branch]
This commit is contained in:
Ben Marsh
2015-01-26 20:18:16 -05:00
parent 79171001e0
commit 24edb4f290
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Engine/Source/Developer/Android/AndroidDeviceDetection/Private/AndroidDeviceDetectionModule.cpp
View File

@@ -8,6 +8,7 @@
#define LOCTEXT_NAMESPACE "FAndroidDeviceDetectionModule"
DEFINE_LOG_CATEGORY_STATIC(AndroidDeviceDetectionLog, Log, All);
class FAndroidDeviceDetectionRunnable : public FRunnable
{
@@ -17,7 +18,8 @@ public:
DeviceMap(InDeviceMap),
DeviceMapLock(InDeviceMapLock),
ADBPathCheckLock(InADBPathCheckLock),
HasADBPath(false)
HasADBPath(false),
ForceCheck(false)
{
}
@@ -46,7 +48,7 @@ public:
while (StopTaskCounter.GetValue() == 0)
{
// query every 10 seconds
if (LoopCount++ >= 10)
if (LoopCount++ >= 10 || ForceCheck)
{
// Make sure we have an ADB path before checking
FScopeLock PathLock(ADBPathCheckLock);
@@ -54,6 +56,7 @@ public:
QueryConnectedDevices();
LoopCount = 0;
ForceCheck = false;
}
FPlatformProcess::Sleep(1.0f);
@@ -66,6 +69,14 @@ public:
{
ADBPath = InADBPath;
HasADBPath = !ADBPath.IsEmpty();
// Force a check next time we go around otherwise it can take over 10sec to find devices
ForceCheck = HasADBPath;
// If we have no path then clean the existing devices out
if (!HasADBPath && DeviceMap.Num() > 0)
{
DeviceMap.Reset();
}
}
private:
@@ -256,6 +267,7 @@ private:
FCriticalSection* ADBPathCheckLock;
bool HasADBPath;
bool ForceCheck;
};
class FAndroidDeviceDetection : public IAndroidDeviceDetection
@@ -293,14 +305,14 @@ public:
return &DeviceMapLock;
}
virtual void UpdateADBPath()
virtual void UpdateADBPath() override
{
FScopeLock PathUpdateLock(&ADBPathCheckLock);
TCHAR AndroidDirectory[32768] = { 0 };
FPlatformMisc::GetEnvironmentVariable(TEXT("ANDROID_HOME"), AndroidDirectory, 32768);
FString ADBPath;
if (AndroidDirectory[0] != 0)
{
#if PLATFORM_WINDOWS