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

Expose versionCode and versionName to configrules

Browse Source 
#android
[REVIEW] Peter.Sauerbrei
#rb Peter.Sauerbrei

[CL 21524922 by chris babcock in ue5-main branch]
This commit is contained in:
chris babcock
2022-08-23 19:21:13 -04:00
parent 72794ffb9f
commit 8a37f7eadf
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Engine/Build/Android/Java/src/com/epicgames/unreal/GameActivity.java.template
View File

@@ -238,6 +238,9 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
ComponentCallbacks2
{
public int VersionCode = 0;
public String VersionName = "Unknown";
public int targetSdkVersion = 0;
private boolean bAllowIMU = true;
private SensorManager sensorManager;
private Sensor accelerometer;
@@ -1708,6 +1711,9 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
variables.put("memory", Integer.toString(totalMemory));
//variables.put("Profile", "Android");
variables.put("versionCode", Integer.toString(VersionCode));
variables.put("versionName", VersionName);
variables.put("targetSdkVersion", Integer.toString(targetSdkVersion));
variables.put("unsupportedDevice", "false");
variables.put("OverrideProfile", "true");
variables.put("hardware", hardware);
@@ -2394,18 +2400,20 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
}
}
//Check for target sdk. If 23 or higher then warn that permission handling may mean features don't work if user denies them.
int targetSdkVersion = 0;
// Retrieve version code, name, and target SDK
try
{
PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
VersionCode = packageInfo.versionCode;
VersionName = packageInfo.versionName;
targetSdkVersion = packageInfo.applicationInfo.targetSdkVersion;
}
catch (PackageManager.NameNotFoundException e)
catch (Exception e)
{
Log.debug(e.getMessage());
Log.debug("Error accessing packageInfo: " + e.getMessage());
}
// Check for target sdk. If 23 or higher then warn that permission handling may mean features don't work if user denies them.
boolean bIsShipping = nativeIsShippingBuild();
if (ANDROID_BUILD_VERSION >= 23 && targetSdkVersion >= 23) //23 is the API level (Marshmallow) where runtime permission handling is available
{
@@ -2645,7 +2653,7 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
_activity.setRequestedOrientation( android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE );
}
}
// Read metadata from AndroidManifest.xml
appPackageName = getPackageName();
String ProjectName = getPackageName();
@@ -2860,17 +2868,15 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
Log.debug( "Debugger attached is " + bDebuggerAttached );
nativeSetAndroidVersionInformation( android.os.Build.VERSION.RELEASE, targetSdkVersion, android.os.Build.MANUFACTURER, android.os.Build.MODEL, android.os.Build.DISPLAY, Language );
try
int PatchVersion = 0;
if (VersionCode > 0)
{
VersionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
int PatchVersion = 0;
nativeSetObbInfo(ProjectName, getApplicationContext().getPackageName(), VersionCode, PatchVersion, AppType);
}
catch (Exception e)
else
{
// if the above failed, then, we can't use obbs
Log.debug("==================================> PackageInfo failure getting .obb info: " + e.getMessage());
Log.debug("==================================> PackageInfo failure getting .obb info: versionCode invalid");
}
// enable the physical volume controls to the game