Merging //UE4/Dev-Main to Dev-Geometry (from CL: 3492074)

#rb none

[CL 3493369 by Mike Fricker in Dev-Geometry branch]
This commit is contained in:
Mike Fricker
2017-06-15 17:45:03 -04:00
parent cb60c57c48
commit fddcdcac09
5884 changed files with 213547 additions and 184356 deletions

View File

@@ -95,6 +95,11 @@ void FAndroidLocalNotificationService::ScheduleLocalNotificationAtTime(const FDa
#endif
}
void FAndroidLocalNotificationService::ScheduleLocalNotificationBadgeAtTime(const FDateTime& FireDateTime, bool LocalTime, const FString& ActivationEvent)
{
// Do nothing...
}
void FAndroidLocalNotificationService::GetLaunchNotification(bool& NotificationLaunchedApp, FString& ActivationEvent, int32& FireDate)
{
#if PLATFORM_ANDROID