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

Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152

Browse Source 
#lockdown: Nick.Penwarden
#rb Integration

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 4824851 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4824878 by ryan vance in Dev-Networking branch]
This commit is contained in:
ryan vance
2019-01-28 16:32:53 -05:00
parent beb83deef9
commit 398a8c4814
970 changed files with 40467 additions and 56485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,8 +310,9 @@ private:
}
else
{
// grab the Android version
const FString AndroidVersionCommand = FString::Printf(TEXT("-s %s %s ro.build.version.release"), *NewDeviceInfo.SerialNumber, *GetPropCommand);
// grab the Lumin/Android version
const FString AndroidVersionCommand = bForLumin ? FString::Printf(TEXT("%s ro.build.id"), *GetPropCommand) :
FString::Printf(TEXT("-s %s %s ro.build.version.release"), *NewDeviceInfo.SerialNumber, *GetPropCommand);
if (!ExecuteAdbCommand(*AndroidVersionCommand, &NewDeviceInfo.HumanAndroidVersion, nullptr))
{
continue;