Add option for public logs on Android

#ue4
#android
[FYI] Jack.Porter,Andrew.Grant
#rb Peter.Sauerbrei


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 7113141 via CL 7113144 via CL 7165976 via CL 7166205
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7170512 by chris babcock in Dev-Build branch]
This commit is contained in:
chris babcock
2019-06-22 10:18:22 -04:00
parent bbfd8385c4
commit 2291841e48
8 changed files with 74 additions and 4 deletions

View File

@@ -404,6 +404,9 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
/** Use ExternalFilesDir for UE4Game files */
private boolean UseExternalFilesDir = false;
/** Make log files public */
private boolean PublicLogFiles = false;
/** Flag to ensure we have finished startup before allowing nativeOnActivityResult to get called */
private boolean InitCompletedOK = false;
@@ -2543,6 +2546,16 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
Log.debug( "bUseExternalFilesDir not found. Leaving as " + UseExternalFilesDir);
}
if (bundle.containsKey("com.epicgames.ue4.GameActivity.bPublicLogFiles"))
{
PublicLogFiles = bundle.getBoolean("com.epicgames.ue4.GameActivity.bPublicLogFiles");
Log.debug( "PublicLogFiles set to " + PublicLogFiles);
}
else
{
Log.debug( "PublicLogFiles not found. Leaving as " + PublicLogFiles);
}
if(bundle.containsKey("com.epicgames.ue4.GameActivity.bAllowIMU"))
{
bAllowIMU = bundle.getBoolean("com.epicgames.ue4.GameActivity.bAllowIMU");
@@ -2590,7 +2603,7 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
Log.debug("APK path: " + getPackageResourcePath());
Log.debug("OBB in APK: " + (PackageDataInsideApkValue==1));
nativeSetGlobalActivity(UseExternalFilesDir, getFilesDir().getPath(), getExternalFilesDir(null).getPath(), PackageDataInsideApkValue==1, getPackageResourcePath());
nativeSetGlobalActivity(UseExternalFilesDir, PublicLogFiles, getFilesDir().getPath(), getExternalFilesDir(null).getPath(), PackageDataInsideApkValue==1, getPackageResourcePath());
// tell the engine if this is a portrait app
nativeSetWindowInfo(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT, DepthBufferPreference);
@@ -5889,7 +5902,7 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
public native boolean nativeIsShippingBuild();
public native void nativeSetAndroidStartupState(boolean bDebuggerAttached);
public native void nativeSetGlobalActivity(boolean bUseExternalFilesDir, String internalFilePath, String externalFilePath, boolean bOBBInAPK, String APKPath);
public native void nativeSetGlobalActivity(boolean bUseExternalFilesDir, boolean bPublicLogFiles, String internalFilePath, String externalFilePath, boolean bOBBInAPK, String APKPath);
public native void nativeSetWindowInfo(boolean bIsPortrait, int DepthBufferPreference);
public native void nativeSetObbInfo(String ProjectName, String PackageName, int Version, int PatchVersion, String AppType);
public native void nativeSetAndroidVersionInformation( String AndroidVersion, String PhoneMake, String PhoneModel, String PhoneBuildNumber, String OSLanguage );