Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@ -36,7 +36,6 @@ namespace System {
static readonly Func<SynchronizationContext> getDefaultSyncContext;
static readonly Func<string> getDefaultTimeZone;
static readonly Func<TimeZone> getCurrentSystemTimeZone;
static AndroidPlatform ()
{
@ -51,11 +50,6 @@ namespace System {
Delegate.CreateDelegate (typeof(Func<string>),
androidRuntime.GetMethod ("GetDefaultTimeZone",
System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic));
MethodInfo mi = androidRuntime.GetMethod ("GetCurrentSystemTimeZone",
System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
if (mi != null)
getCurrentSystemTimeZone = (Func<TimeZone>) Delegate.CreateDelegate (typeof(Func<TimeZone>), mi);
}
internal static SynchronizationContext GetDefaultSyncContext ()
@ -67,13 +61,6 @@ namespace System {
{
return getDefaultTimeZone ();
}
internal static TimeZone GetCurrentSystemTimeZone ()
{
if (getCurrentSystemTimeZone == null)
return null;
return getCurrentSystemTimeZone ();
}
}
}
#endif