From 50ae77fea5e635175cb07b18451563701dcb714e Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Thu, 20 Aug 2020 11:49:09 -0500
Subject: [PATCH] Revert "[MediaElement] Removed line that pauses player before
 setting it to null. (#9531)"

This reverts commit 9f3410baa9e77273a663d21c1656b3a743596a98.
---
 .../Issue9525.cs                              | 75 -------------------
 ...rin.Forms.Controls.Issues.Shared.projitems |  1 -
 .../Renderers/MediaElementRenderer.cs         |  1 +
 3 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue9525.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue9525.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue9525.cs
deleted file mode 100644
index 4e77ae28399..00000000000
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue9525.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System.Collections.Generic;
-using System.Reflection;
-using Xamarin.Forms.CustomAttributes;
-using Xamarin.Forms.Internals;
-
-#if UITEST
-using Xamarin.Forms.Core.UITests;
-using Xamarin.UITest;
-using NUnit.Framework;
-#endif
-
-namespace Xamarin.Forms.Controls.Issues
-{
-#if UITEST
-	[Category(UITestCategories.ManualReview)]
-#endif
-	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Github, 9525, "MediaElement Disposing exception when MainPage is changed on iOS", PlatformAffected.iOS)]
-	public class Issue9525 : TestNavigationPage
-	{
-		protected override void Init()
-		{
-			Device.SetFlags(new List<string>(Device.Flags ?? new List<string>()) { "MediaElement_Experimental" });
-
-			PushAsync(CreateRoot());
-		}
-		private ContentPage CreateRoot()
-		{ 
-			var button = new Button
-			{
-				AutomationId = "Issue9525Button",
-				Text = "Go to new page",
-			};
-			button.Clicked += Button_Clicked;
-			return new ContentPage
-			{
-				Content = new StackLayout
-				{
-					Children =
-					{
-						new MediaElement
-						{
-							AutomationId = "Issue9525MediaElement",
-							Source = "https://sec.ch9.ms/ch9/80a3/6563611f-6a39-44fa-a768-1a58bdd080a3/HotRestart.mp4",
-							HeightRequest=200,
-						},
-						button
-					}
-				}
-			};
-			
-		}
-		private void Button_Clicked(object sender, System.EventArgs e)
-		{
-			Navigation.InsertPageBefore(CreateRoot(), CurrentPage);
-			Navigation.RemovePage(CurrentPage);
-		}
-
-
-#if UITEST
-		[Test]
-		public void Issue9525Test()
-		{
-			//Will be exeption if fail.
-			RunningApp.Screenshot("I am at Issue9525");
-			for (var i = 0; i < 10; i++)
-			{
-				RunningApp.WaitForElement(q => q.Marked("Issue9525Button"));
-				RunningApp.Screenshot("I see the Button");
-				RunningApp.Tap("Issue9525Button");
-			}
-		}
-#endif
-	}
-}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 9da8b3cace2..2487c8242e8 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -269,7 +269,6 @@
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue9833.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue9929.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Issue9525.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RefreshViewTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue7338.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ScrollToGroup.cs" />
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/MediaElementRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/MediaElementRenderer.cs
index 77617842626..80cd381a396 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/MediaElementRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/MediaElementRenderer.cs
@@ -129,6 +129,7 @@ protected override void Dispose(bool disposing)
 
 			RemoveStatusObserver();
 
+			_avPlayerViewController?.Player?.Pause();
 			_avPlayerViewController?.Player?.ReplaceCurrentItemWithPlayerItem(null);
 
 			base.Dispose(disposing);