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]
This commit is contained in:
Daniel Lamb
2014-05-22 15:49:58 -04:00
committed by UnrealBot
parent a1f5a9f843
commit 70c1dbdd00
2 changed files with 10 additions and 3 deletions

View File

@@ -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");