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

Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157

Browse Source 
[CL 14233282 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2020-09-01 14:07:48 -04:00
parent a5927a5d32
commit 7379fa99c5
2361 changed files with 110950 additions and 41134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template
View File

@@ -82,6 +82,7 @@ import android.os.SystemClock;
import android.os.Looper;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.PowerManager;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -139,6 +140,7 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.WindowInsets;
import android.view.WindowManager;
import android.view.Display;
import android.view.Window;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
@@ -155,6 +157,7 @@ import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.games.Games;
import com.google.android.apps.internal.games.memoryadvice.MemoryAdvisor;
import com.google.android.gms.plus.Plus;
@@ -511,6 +514,12 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
public static final int ANDROID_BUILD_VERSION = android.os.Build.VERSION.SDK_INT;
private StoreHelper IapStoreHelper;
private MemoryAdvisor MemAdvisor;
private static final int MemoryAdvisorPollDelayMs = 100;
private static final int ProcessMemoryInfoPollDelayMs = 10000;
private long LastMemoryInfoPollTime;
private MemoryAdvisor.MemoryState MemState = MemoryAdvisor.MemoryState.OK;
//$${gameActivityClassAdditions}$$
@@ -2351,39 +2360,77 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
{
Logger.SuppressLogs();
}
MemAdvisor = new MemoryAdvisor(this);
LastMemoryInfoPollTime = System.currentTimeMillis();
// update memory stats every 10 seconds
memoryRunnable = new Runnable() {
@Override
public void run()
{
int ProcessMemory = 0;
ActivityManager activityManager = (ActivityManager)_activity.getSystemService(Context.ACTIVITY_SERVICE);
int pid = android.os.Process.myPid();
int pids[] = new int[] { pid };
android.os.Debug.MemoryInfo[] memoryInfo = activityManager.getProcessMemoryInfo(pids);
if (memoryInfo.length > 0)
JSONObject Advice = MemAdvisor.getAdvice();
MemoryAdvisor.MemoryState CurrentMemoryState = MemoryAdvisor.getMemoryState(Advice);
if (CurrentMemoryState != MemState)
{
ProcessMemory = memoryInfo[0].dalvikPss + memoryInfo[0].nativePss + memoryInfo[0].otherPss;
if (Build.VERSION.SDK_INT >= 23)
switch (CurrentMemoryState)
{
Map<String, String> memstats = memoryInfo[0].getMemoryStats();
if (memstats.containsKey("summary.total-pss"))
case UNKNOWN:
Log.warn("Cannot determine memory state");
nativeOnMemoryWarningChanged(_activity, -1);
break;
case OK:
nativeOnMemoryWarningChanged(_activity, 0);
break;
case APPROACHING_LIMIT:
Log.warn("Approaching memory limit. Estimated available memory is " + MemoryAdvisor.availabilityEstimate(Advice) + " bytes");
nativeOnMemoryWarningChanged(_activity, 1);
break;
case CRITICAL:
Log.warn("Critical memory limit. Estimated available memory is " + MemoryAdvisor.availabilityEstimate(Advice) + " bytes");
nativeOnMemoryWarningChanged(_activity, 2);
break;
}
MemState = CurrentMemoryState;
}
int ProcessMemory = 0;
long CurrentTimeMs = System.currentTimeMillis();
if (CurrentTimeMs - LastMemoryInfoPollTime >= ProcessMemoryInfoPollDelayMs)
{
ActivityManager activityManager = (ActivityManager)_activity.getSystemService(Context.ACTIVITY_SERVICE);
int pid = android.os.Process.myPid();
int pids[] = new int[] { pid };
android.os.Debug.MemoryInfo[] memoryInfo = activityManager.getProcessMemoryInfo(pids);
if (memoryInfo.length > 0)
{
ProcessMemory = memoryInfo[0].dalvikPss + memoryInfo[0].nativePss + memoryInfo[0].otherPss;
if (Build.VERSION.SDK_INT >= 23)
{
ProcessMemory = Integer.parseInt(memstats.get("summary.total-pss"));
Map<String, String> memstats = memoryInfo[0].getMemoryStats();
if (memstats.containsKey("summary.total-pss"))
{
ProcessMemory = Integer.parseInt(memstats.get("summary.total-pss"));
}
}
}
Log.debug("Used memory: " + ProcessMemory + " ("+FindLineFromStatus("VmRSS:")+")");
LastMemoryInfoPollTime = CurrentTimeMs;
}
Log.debug("Used memory: " + ProcessMemory + " ("+FindLineFromStatus("VmRSS:")+")");
synchronized(_activity)
{
_activity.UsedMemory = ProcessMemory;
if (ProcessMemory > 0)
{
_activity.UsedMemory = ProcessMemory;
}
if (_activity.memoryHandler != null)
{
_activity.memoryHandler.postDelayed(this, 10000);
_activity.memoryHandler.postDelayed(this, _activity.MemoryAdvisorPollDelayMs);
}
}
}
@@ -3102,6 +3149,19 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
//$${gameActivityAfterMainViewCreatedAdditions}$$
clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
if (Build.VERSION.SDK_INT >= 29)
{
PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
powerManager.addThermalStatusListener(getMainExecutor(), new PowerManager.OnThermalStatusChangedListener() {
@Override
public void onThermalStatusChanged(int status)
{
Log.debug("=== Thermal status changed to " + status);
nativeOnThermalStatusChangedListener(null, status);
}
});
}
//$${gameActivityOnCreateAdditions}$$
//$${gameActivityOnCreateFinalAdditions}$$
@@ -5232,6 +5292,99 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
return false;
}
public int[] AndroidThunkJava_GetSupportedNativeDisplayRefreshRates()
{
if(ANDROID_BUILD_VERSION >= 24)
{
WindowManager windowManager = getWindowManager();
Display display = windowManager.getDefaultDisplay();
Display.Mode currentmode = display.getMode();
Display.Mode[] modes = display.getSupportedModes();
ArrayList<Integer> refreshlist = new ArrayList<Integer>();
for (int i = 0; i < modes.length; i++)
{
if (modes[i].getPhysicalHeight() == currentmode.getPhysicalHeight() &&
modes[i].getPhysicalWidth() == currentmode.getPhysicalWidth())
{
refreshlist.add((int)modes[i].getRefreshRate());
}
}
if (refreshlist.size() == 0)
{
refreshlist.add(60);
}
int[] result = new int[refreshlist.size()];
for (int i=0; i < result.length; i++)
{
result[i] = refreshlist.get(i).intValue();
}
return result;
}
else
{
int[] result = new int[1];
result[0] = 60;
return result;
}
}
public boolean AndroidThunkJava_SetNativeDisplayRefreshRate(int RefreshRate)
{
if(ANDROID_BUILD_VERSION >= 24)
{
WindowManager windowManager = getWindowManager();
Display display = windowManager.getDefaultDisplay();
Display.Mode currentmode = display.getMode();
int currentmodeid = currentmode.getModeId();
Display.Mode[] modes = display.getSupportedModes();
for (int i = 0; i < modes.length; i++)
{
if (modes[i].getPhysicalHeight() == currentmode.getPhysicalHeight() &&
modes[i].getPhysicalWidth() == currentmode.getPhysicalWidth() &&
(int)modes[i].getRefreshRate() == RefreshRate)
{
final int modeid = modes[i].getModeId();
if(currentmodeid != modeid)
{
_activity.runOnUiThread(new Runnable()
{
public void run()
{
Window w = getWindow();
WindowManager.LayoutParams l = w.getAttributes();
l.preferredDisplayModeId = modeid;
w.setAttributes(l);
}
});
Log.debug("Found mode " + modeid + " for native refresh rate "+RefreshRate);
}
return true;
}
}
return false;
}
else
{
return (RefreshRate == 60);
}
}
public int AndroidThunkJava_GetNativeDisplayRefreshRate()
{
if(ANDROID_BUILD_VERSION >= 24)
{
WindowManager windowManager = getWindowManager();
Display display = windowManager.getDefaultDisplay();
Display.Mode currentmode = display.getMode();
return (int)currentmode.getRefreshRate();
}
return 60;
}
@SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public static boolean isAirplaneModeOn(Context context)
@@ -6218,6 +6371,9 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
public native void nativeOnInitialDownloadStarted();
public native void nativeOnInitialDownloadCompleted();
public native void nativeOnThermalStatusChangedListener(GameActivity activity, int status);
public native void nativeOnMemoryWarningChanged(GameActivity activity, int status);
static
{