Try catch the uimode manager (xamarin#818)

chrisstaley · Jun 17, 2019 · f51d074 · f51d074
1 parent a12f14d
commit f51d074
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.android.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.android.cs
@@ -33,8 +33,15 @@ static DeviceIdiom GetIdiom()
             // first try UIModeManager
             using (var uiModeManager = UiModeManager.FromContext(Essentials.Platform.AppContext))
             {
-                var uiMode = uiModeManager?.CurrentModeType ?? UiMode.TypeUndefined;
-                currentIdiom = DetectIdiom(uiMode);
+                try
+                {
+                    var uiMode = uiModeManager?.CurrentModeType ?? UiMode.TypeUndefined;
+                    currentIdiom = DetectIdiom(uiMode);
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Debug.WriteLine($"Unable to detect using UiModeManager: {ex.Message}");
+                }
             }
 
             // then try Configuration