From 70c1dbdd00a25fc914e63cd5ad476be93b9b3eff Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Thu, 22 May 2014 15:49:58 -0400 Subject: [PATCH] Integrate 2082055 4.2 -> Main Fix for google play projects which don't have google play enabled initializing google play.. #codereview Peter.Sauerbrei #codereview JJ.Hoesing //depot/UE4-Releases/4.2/Engine/... to //depot/UE4/Engine/... [CL 2082297 by Daniel Lamb in Main branch] --- .../Java/src/com/epicgames/ue4/GameActivity.java | 11 +++++++++-- .../Runtime/Launch/Private/Android/LaunchAndroid.cpp | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java b/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java index 9c26d98fce73..a36c009a91dd 100644 --- a/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java +++ b/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java @@ -508,6 +508,11 @@ public class GameActivity extends NativeActivity implements GoogleApiClient.Conn public void AndroidThunkJava_GooglePlayConnect() { + if ( !nativeIsGooglePlayEnabled() ) + { + return; + } + int status = GooglePlayServicesUtil.isGooglePlayServicesAvailable(getApplicationContext()); // check if google play services is available on this device, or is available with an update @@ -516,8 +521,8 @@ public class GameActivity extends NativeActivity implements GoogleApiClient.Conn return; } - googleClient.connect(); - } + googleClient.connect(); + } public void AndroidThunkJava_ShowLeaderboard(String LeaderboardID) { @@ -770,6 +775,8 @@ public class GameActivity extends NativeActivity implements GoogleApiClient.Conn public native void nativeConsoleCommand(String commandString); + public native boolean nativeIsGooglePlayEnabled(); + static { System.loadLibrary("UE4"); diff --git a/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp b/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp index 704756988b0c..bd6185ed8e8c 100644 --- a/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp +++ b/Engine/Source/Runtime/Launch/Private/Android/LaunchAndroid.cpp @@ -871,7 +871,7 @@ extern "C" void Java_com_epicgames_ue4_GameActivity_nativeConsoleCommand(JNIEnv* //This function is declared in the Java-defined class, GameActivity.java: "public native void nativeIsGooglePlayEnabled();" extern "C" jboolean Java_com_epicgames_ue4_GameActivity_nativeIsGooglePlayEnabled(JNIEnv* jenv, jobject thiz) { - bool bEnabled = true; + bool bEnabled = false; GConfig->GetBool(TEXT("/Script/AndroidRuntimeSettings.AndroidRuntimeSettings"), TEXT("bEnableGooglePlaySupport"), bEnabled, GEngineIni); UE_LOG(LogOnline, Log, TEXT("Checking whether Google Play is enabled. bEnableGooglePlaySupport = %d"), bEnabled); return bEnabled;