Merging //UE4/Dev-Main @ 4397329 to Dev-Core (//UE4/Dev-Core)

#rb none

[CL 4397828 by Robert Manuszewski in Dev-Core branch]

Engine/Source/Runtime/Core/Public/Android/AndroidAffinity.h

@@ -10,6 +10,8 @@ AndroidAffinity.h: Android affinity profile masks definitions.
 
 class FAndroidAffinity : public FGenericPlatformAffinity
 {
+private:
+	static uint64 GetLittleCoreMask();
 public:
 	static const CORE_API uint64 GetMainGameMask()
 	{
@@ -20,6 +22,47 @@ public:
 	{
 		return RenderingThreadMask;
 	}
+
+	static const CORE_API uint64 GetRHIThreadMask()
+	{
+		return FGenericPlatformAffinity::GetNoAffinityMask();
+	}
+
+	static const CORE_API uint64 GetRTHeartBeatMask()
+	{
+		return GetLittleCoreMask();
+	}
+
+	static const CORE_API uint64 GetPoolThreadMask()
+	{
+		return GetLittleCoreMask();
+	}
+
+	static const CORE_API uint64 GetTaskGraphThreadMask()
+	{
+		return GetLittleCoreMask();
+	}
+
+	static const CORE_API uint64 GetStatsThreadMask()
+	{
+		return GetLittleCoreMask();
+	}
+
+	static const CORE_API uint64 GetAudioThreadMask()
+	{
+		return GetLittleCoreMask();
+	}
+
+	static const CORE_API uint64 GetTaskGraphBackgroundTaskMask()
+	{
+		return GetLittleCoreMask();
+	}
+
+	static const CORE_API uint64 GetAsyncLoadingThreadMask()
+	{
+		return GetLittleCoreMask();
+	}
+
 	static EThreadPriority GetRenderingThreadPriority()
 	{
 		return TPri_SlightlyBelowNormal;

Engine/Source/Runtime/Core/Public/Android/AndroidMisc.h

@@ -26,8 +26,8 @@ class TFunction;
 struct CORE_API FAndroidMisc : public FGenericPlatformMisc
 {
 	static void RequestExit( bool Force );
-	static void LowLevelOutputDebugString(const TCHAR *Message);
 	static void LocalPrint(const TCHAR *Message);
+	static bool IsLocalPrintThreadSafe() { return true; }
 	static void PlatformPreInit();
 	static void PlatformInit();
 	static void PlatformTearDown();
@@ -93,6 +93,8 @@ public:
 	// Returns current volume, 0-15
 	static int GetVolumeState(double* OutTimeOfChangeInSec = nullptr);
 
+	static int32 GetDeviceVolume();
+
 #if USE_ANDROID_FILE
 	static const TCHAR* GamePersistentDownloadDir();
 	static FString GetLoginId();
@@ -103,6 +105,7 @@ public:
 #endif
 	static FString GetCPUVendor();
 	static FString GetCPUBrand();
+	static FString GetCPUChipset();
 	static FString GetPrimaryGPUBrand();
 	static void GetOSVersions(FString& out_OSVersionLabel, FString& out_OSSubVersionLabel);
 	static bool GetDiskTotalAndFreeSpace(const FString& InPath, uint64& TotalNumberOfBytes, uint64& NumberOfFreeBytes);
@@ -125,6 +128,7 @@ public:
 	static FBatteryState GetBatteryState();
 	static int GetBatteryLevel();
 	static bool IsRunningOnBattery();
+	static bool IsInLowPowerMode();
 	static float GetDeviceTemperatureLevel();
 	static bool AreHeadPhonesPluggedIn();
 	static ENetworkConnectionType GetNetworkConnectionType();
@@ -146,11 +150,12 @@ public:
 	static void ShareURL(const FString& URL, const FText& Description, int32 LocationHintX, int32 LocationHintY);
 
 	// ANDROID ONLY:
-	static void SetVersionInfo( FString AndroidVersion, FString DeviceMake, FString DeviceModel, FString OSLanguage );
+	static void SetVersionInfo(FString AndroidVersion, FString DeviceMake, FString DeviceModel, FString DeviceBuildNumber, FString OSLanguage);
 	static const FString GetAndroidVersion();
 	static const FString GetDeviceMake();
 	static const FString GetDeviceModel();
 	static const FString GetOSLanguage();
+	static const FString GetDeviceBuildNumber();
 	static FString GetDefaultLocale();
 	static FString GetGPUFamily();
 	static FString GetGLVersion();
@@ -160,6 +165,8 @@ public:
 #if USE_ANDROID_JNI
 	static int GetAndroidBuildVersion();
 #endif
+	static TMap<FString, FString> GetConfigRulesTMap();
+	static FString* GetConfigRulesVariable(const FString& Key);
 
 	/* HasVulkanDriverSupport
 	 * @return true if this Android device supports a Vulkan API Unreal could use
@@ -184,6 +191,9 @@ public:
 	static void SetOnReInitWindowCallback(ReInitWindowCallbackType InOnReInitWindowCallback);
 	static FString GetOSVersion();
 	static bool GetOverrideResolution(int32 &ResX, int32& ResY) { return false; }
+	typedef TFunction<void()> OnPauseCallBackType;
+	static OnPauseCallBackType GetOnPauseCallback();
+	static void SetOnPauseCallback(OnPauseCallBackType InOnPauseCallback);
 
 #if !UE_BUILD_SHIPPING
 	static bool IsDebuggerPresent();
@@ -258,11 +268,15 @@ public:
 	static FString AndroidVersion; // version of android we are running eg "4.0.4"
 	static FString DeviceMake; // make of the device we are running on eg. "samsung"
 	static FString DeviceModel; // model of the device we are running on eg "SAMSUNG-SGH-I437"
+	static FString DeviceBuildNumber; // platform image build number of device "R16NW.G960NKSU1ARD6"
 	static FString OSLanguage; // language code the device is set to
 
 	// Build version of Android, i.e. API level.
 	static int32 AndroidBuildVersion;
 
+	// Key/Value pair variables from the optional configuration.txt
+	static TMap<FString, FString> ConfigRulesVariables;
+
 	static bool VolumeButtonsHandledBySystem;
 
 	enum class ECoreFrequencyProperty

Engine/Source/Runtime/Core/Public/Android/AndroidPlatform.h

@@ -55,7 +55,7 @@ typedef FAndroidTypes FPlatformTypes;
 #define PLATFORM_UI_HAS_MOBILE_SCROLLBARS			1
 #define PLATFORM_UI_NEEDS_TOOLTIPS					0
 #define PLATFORM_UI_NEEDS_FOCUS_OUTLINES			0
-#define PLATFORM_SUPPORTS_EARLY_MOVIE_PLAYBACK		0 // movies will start before engine is initalized
+#define PLATFORM_SUPPORTS_EARLY_MOVIE_PLAYBACK		1 // movies will start before engine is initalized
 
 #if defined(EXPERIMENTAL_OPENGL_RHITHREAD) && EXPERIMENTAL_OPENGL_RHITHREAD
 	#define PLATFORM_RHITHREAD_DEFAULT_BYPASS			0

Engine/Source/Runtime/Core/Public/Android/AndroidString.h

@@ -613,3 +613,4 @@ struct FAndroidPlatformString : public FGenericPlatformString
 #endif
 
 typedef FAndroidPlatformString FPlatformString;
+