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

Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680

Browse Source 
#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
This commit is contained in:
jack porter
2019-01-24 20:39:08 -05:00
parent 9d4a292d5f
commit 2bbc43bc53
8687 changed files with 1060230 additions and 285280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Engine/Build/Android/Java/src/com/epicgames/ue4/LocalNotificationReceiver.java
View File

@@ -56,6 +56,7 @@
.setContentTitle(title);
if (android.os.Build.VERSION.SDK_INT >= 21)
{
builder.setContentText(details);
builder.setColor(0xff0e1e43);
}

21
Engine/Build/Android/Java/src/com/epicgames/ue4/MediaPlayer14.java
View File

@@ -270,10 +270,23 @@ public class MediaPlayer14
MediaExtractor extractor = new MediaExtractor();
if (extractor != null)
{
extractor.setDataSource(UrlPath);
updateTrackInfo(extractor);
extractor.release();
extractor = null;
try
{
extractor.setDataSource(UrlPath);
updateTrackInfo(extractor);
extractor.release();
extractor = null;
}
catch (Exception e)
{
GameActivity.Log.debug("setDataSourceURL: Exception = " + e);
// unable to collect track info, but can still try to play it
GameActivity.Log.debug("setDataSourceURL: Continuing without track info");
extractor.release();
extractor = null;
return true;
}
}
}
}