From: Samantha Houts <samantha@teamredwall.com>
Date: Wed, 8 Mar 2017 10:21:15 +0000 (-0800)
Subject: [Android] Add null checks to ActivityIndicator (#804)
X-Git-Tag: beta-2.3.4-pre3~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eac16ffa0c21a7ca94f700be257b31f6313520db;p=platform%2Fupstream%2Fxamarin-forms.git

[Android] Add null checks to ActivityIndicator (#804)
---

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs
index f536b47..17b9cc8 100644
--- a/Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs
@@ -45,16 +45,22 @@ namespace Xamarin.Forms.Platform.Android
 
 		void UpdateColor()
 		{
+			if (Element == null || Control == null)
+				return;
+
 			Color color = Element.Color;
 
 			if (!color.IsDefault)
-				Control.IndeterminateDrawable.SetColorFilter(color.ToAndroid(), PorterDuff.Mode.SrcIn);
+				Control.IndeterminateDrawable?.SetColorFilter(color.ToAndroid(), PorterDuff.Mode.SrcIn);
 			else
-				Control.IndeterminateDrawable.ClearColorFilter();
+				Control.IndeterminateDrawable?.ClearColorFilter();
 		}
 
 		void UpdateVisibility()
 		{
+			if (Element == null || Control == null)
+				return;
+
 			Control.Visibility = Element.IsRunning ? ViewStates.Visible : ViewStates.Invisible;
 		}
 	}