397 Commits

Author SHA1 Message Date
michael kirzinger
f6ac5e2ec8 Back out changelist 13033128 to fix CIS
#ROBOMERGE-SOURCE: CL 13034464 via CL 13034473
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13034478 by michael kirzinger in Main branch]
2020-04-24 12:28:08 -04:00
michael kirzinger
ba2dcd6317 Provide a way to pass an obfuscated user id when purchasing using GooglePlay. Google uses this as part of their anti-fraud efforts
[at]sam.zamani, [at]eric.newman, [at]rob.cannaday

#ROBOMERGE-OWNER: michael.kirzinger
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 13032447 via CL 13033126 via CL 13033127 via CL 13033128 via CL 13033131
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13033133 by michael kirzinger in Main branch]
2020-04-24 10:10:53 -04:00
chris babcock
5901c8a0ca Add option for up to 2 overflow obb files
#ue4
#android
[CODEREVIEW] Jack.Porter
#rb none


#ROBOMERGE-SOURCE: CL 12910957 via CL 12910958 via CL 12910959
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12910960 by chris babcock in Main branch]
2020-04-19 04:56:53 -04:00
dmitriy dyomin
326c0fd0a3 Fixed: Centering Android splash image only when background is an actual image
#jira UE-90200
#rb chris.babcock
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12845384 in //UE4/Release-4.25/... via CL 12845436 via CL 12845442
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12845496 by dmitriy dyomin in Main branch]
2020-04-16 03:01:45 -04:00
chris babcock
2d3d437982 Move optional loadLibrary requests to after libUE4
#jira UE-90022
#ue4
#android
[FYI] Jack.Porter
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 12670397 in //UE4/Release-4.25/... via CL 12670401 via CL 12670403
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12671917 by chris babcock in Main branch]
2020-04-08 10:10:01 -04:00
chris adams
ea1a66b980 adding android screenshot blocking, adding iOS screenshot/video caption detection, enabling video analytics for android
#rb jens.petersam

#ROBOMERGE-SOURCE: CL 12639572 via CL 12644286 via CL 12644366 via CL 12649419 via CL 12649467 via CL 12649516
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12649559 by chris adams in Main branch]
2020-04-07 00:48:33 -04:00
jack porter
227c97b32a Change libUE4 and libc++ load order on Android make sure that STL allocations go through our allocators.
[FYI] Carl.Lloyd, Chris.Babcock
#jira UE-90022
#rb Chris.Babcock
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 12506958 in //UE4/Release-4.25/... via CL 12506959 via CL 12506964
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12506966 by jack porter in Main branch]
2020-04-01 11:42:27 -04:00
dmitriy dyomin
6167456c88 Center android splash image to avoid stretching on wide screens
#jira UE-90200
#rb chris.babcock

#ROBOMERGE-SOURCE: CL 12496258 in //UE4/Release-4.25/... via CL 12496262 via CL 12496270
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12496280 by dmitriy dyomin in Main branch]
2020-03-31 09:44:20 -04:00
allan bentham
1e7525c877 Android java app restart only happens from the uithread.
- Fixes possible race condition in which startActivity could create the new activity in the same process as the outgoing activity and then exiting process.
#rb chris.babcock


#ROBOMERGE-SOURCE: CL 12298521 via CL 12298547 via CL 12298553 via CL 12298562
#ROBOMERGE-BOT: (v670-12295787)

[CL 12298568 by allan bentham in Main branch]
2020-03-19 11:51:15 -04:00
ben temple
97f9873fe1 Make NetworkChangedManager verify internet against different hosts
Summary:
For some reason some wifis appear to have issues contacting `https://example.com/`
In logs provided by Stephen, it is clear in the logs that it is failing to contact this host, and even in a web browser he was unable to open `https://example.com` which is extremely unexpected.
This changes updates the network manager to include two other hosts as options to validate internet connectivity against:
     "https://google.com/"
     "https://www.samsung.com/"

I included samsung in-case google was blocked such as in a region like China.
The verification of the internet will check all 3 domains before determining that network connectivity is down.
If one domain fails (such as example.com) but the next succeeds, because of how the indexing is performed the next time the internet is validated the previously used host that was successfully validated against will be used first in its check.

Test-plan:
I performed multiple network checks and saw no anomolies:
1. I turned the wifi off and then back on
2. I turned the wifi on, and then back off as soon as it connected to force a validation failure
     - Verified in the logs that it attempted to contact all 3 hosts
In all my testing the network connectivity was correctly identified as I would expect and while connected I was able to use the app.

As a final test, I gave Stephen Leicht an APK with these changes to verify that he was no longer experiencing what he reported in FORT-271049.
He saw no issues when using the app and it functioned as expected

[REVIEW] chris.babcock, mor.sela, zhaolong.zhong


#ROBOMERGE-SOURCE: CL 12237831 via CL 12237839 via CL 12237841 via CL 12245951
#ROBOMERGE-BOT: (v668-12245121)

[CL 12246023 by ben temple in Main branch]
2020-03-18 10:39:21 -04:00
ben temple
d81ce55668 Catch exception that can occur when attempting to clear keyboard focus after having used autocomplete
Importing changes applied to 12.10 here: https://p4-swarm.epicgames.net/reviews/12121724/

Test Plan:
Launched app and game without fix
Verified that after typing in text, using auto complete, and dismissing the keyboard the game did crash

Launched app and game with fix
Verified that after typing in text, using auto complete, and dismissing the keyboard the game did not crash

This was tested and verified by QA in 12.10. See this review: https://p4-swarm.epicgames.net/reviews/12121724/ and the referenced jira task.



#ROBOMERGE-SOURCE: CL 12140768 via CL 12140800 via CL 12140828
#ROBOMERGE-BOT: (v659-12123632)

[CL 12140854 by ben temple in Main branch]
2020-03-11 17:21:22 -04:00
wei liu
662fa07f5a Fix an android input issue with floating keyboard
#jira none

#rb mi.wang

#ROBOMERGE-SOURCE: CL 12124819 in //UE4/Release-4.25/... via CL 12124822
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12124826 by wei liu in Main branch]
2020-03-11 09:23:38 -04:00
jack porter
9a7c32c36b Unblocking Robomerge for "Add gameActivityForceQuitAdditions to allow android plugins to be notified when an application requests to quit."
#rb chris.babcock
#rnx
#fyi Allan.Bentham

#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 12000213 via CL 12000756 via CL 12002284 via CL 12005787
#ROBOMERGE-BOT: (v656-11643781)

[CL 12048213 by jack porter in Main branch]
2020-03-07 05:52:12 -05:00
allan bentham
b457410244 Add option for android crash context to not write log when storing crashinfo.
Add gameActivityOnRestartApplicationAdditions to allow plugins to get notice of app restart requests.
#rb chris.babcock
#rnx


#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 11894983 via CL 11894984 via CL 11894986
#ROBOMERGE-BOT: (v656-11643781)

[CL 11895006 by allan bentham in Main branch]
2020-03-04 06:55:54 -05:00
wei liu
ac8745dea8 Try to fix an android input issue with floating keyboard.
#jira UE-89450

#rb chris.babcock, jack.porter, mi.wang, yuntian.chai

#ROBOMERGE-SOURCE: CL 11850513 in //UE4/Release-4.25/... via CL 11850514
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11850704 by wei liu in Main branch]
2020-03-02 21:52:16 -05:00
chris babcock
ac028e9438 Disable autofill manager in GameActivity to prevent Android 10 crash
#android
[REVIEW]
#rb none


#ROBOMERGE-SOURCE: CL 11642140 via CL 11642332 via CL 11642349 via CL 11642365
#ROBOMERGE-BOT: (v656-11643781)

[CL 11834211 by chris babcock in Main branch]
2020-03-02 13:11:01 -05:00
chris babcock
6df461dc0d Provide more control over OBB selection
#jira UE-89810
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 11792686 in //UE4/Release-4.25/... via CL 11792867
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11792949 by chris babcock in Main branch]
2020-02-28 20:20:36 -05:00
chris babcock
c0d1cde0b0 Update Android toolchain to NDK 21 (20 also supported for x86_64)
#jira UE-80046
#ue4
#android
#rb Bradon.Schaefer


#ROBOMERGE-SOURCE: CL 11554677 in //UE4/Release-4.25/... via CL 11554724
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11578268 by chris babcock in Main branch]
2020-02-21 15:06:37 -05:00
ben temple
d249fb877e Update NetworkChangedManager to provide connection transport type
The networkChangedManager is the best place to know what kind of connection type we have. This updates the engine and both related projects (web and native) to support receiving this information in the onNetworkAvailable callback.
The callback will be called each time the transport type changes.

Test-plan:
Built native and web versions of app here:
Native:
https://ec-01.epicgames.net/commander/link/jobDetails/jobs/10035906?
Web:
https://ec-01.epicgames.net/commander/link/jobDetails/jobs/10035907?
Launched both versions of the app
Verified that turning off wifi and back on triggered no connection alert
Verified that switching between wifi and cellular back triggered calls to the onNetworkAvailable as expected

#reviewers chris.babcock, zhao.zhong


#ROBOMERGE-OWNER: ben.temple
#ROBOMERGE-AUTHOR: ben.temple
#ROBOMERGE-SOURCE: CL 11560308 via CL 11560328 via CL 11560331
#ROBOMERGE-BOT: (v654-11333218)

[CL 11560333 by ben temple in Main branch]
2020-02-19 23:27:34 -05:00
chris babcock
a963357022 Add FAndroidMisc::IsSupportedAndroidDevice()
#android
[FYI] Wes.Hunt
#rb Wes.Hunt



#ROBOMERGE-SOURCE: CL 11258490 via CL 11258499 via CL 11258503
#ROBOMERGE-BOT: (v647-11244347)

[CL 11258949 by chris babcock in Main branch]
2020-02-05 14:42:51 -05:00
Billy McCarroll
15d5ea2dd5 Add new features from Google Play Billing API
Create Blueprint Nodes for StoreV2
Modify Match3 to use SToreV2 blueprint nodes

#review-11072654 @eric.newman

#rb eric.newman

[CL 11183040 by Billy McCarroll in Main branch]
2020-01-30 14:21:24 -05:00
chris babcock
6b74e750a6 Add bDeviceSupported to GameActivity for configrules to modfy
#ue4
#android
[at]Allan.Bentham
#rb Allan.Bentham



#ROBOMERGE-SOURCE: CL 11136559 via CL 11136567 via CL 11136570
#ROBOMERGE-BOT: (v640-11091645)

[CL 11136574 by chris babcock in Main branch]
2020-01-28 16:29:45 -05:00
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Marc Audy
0ea8c363bf Added ability to check OS level notification status on Android.
#author Casey.Spencer
#rb Chris.Babcock
#rnx

[CL 10795670 by Marc Audy in Main branch]
2019-12-18 10:25:26 -05:00