From 0962426f5e223d8e9ae9fb26bcda6a30636e0aa2 Mon Sep 17 00:00:00 2001
From: AhamedAliNishad <ahamedalinishad.j@syncfusion.com>
Date: Fri, 30 Aug 2024 20:25:26 +0530
Subject: [PATCH 1/6] Committed the changes of the issue

---
 .../Handlers/Android/FrameRenderer.cs         |  2 +-
 .../TestCases.HostApp/Issues/Issue15196.xaml  | 15 +++++++++
 .../Issues/Issue15196.xaml.cs                 | 33 +++++++++++++++++++
 .../Tests/Issues/Issue15196.cs                | 25 ++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index bb64e53baf5b..70a17fdbb030 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -131,7 +131,7 @@ protected override void Dispose(bool disposing)
 				{
 					var child = GetChildAt(0);
 					child?.RemoveFromParent();
-					child?.Dispose();
+					child = null;
 				}
 
 				Element?.Handler?.DisconnectHandler();
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
new file mode 100644
index 000000000000..138d0807231f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+              x:Class="Maui.Controls.Sample.Issues.Issue15196">
+
+  <StackLayout x:Name="stackLayout">
+    <Frame x:Name="frame" AutomationId="FrameWithEntry" HeightRequest="200">
+      <Entry x:Name="entry" Text="This is entry inside the frame"/>
+    </Frame>
+
+    <Button Text="Remove the frame" AutomationId="RemoveButton" Clicked="Button_Clicked"/>
+
+  </StackLayout>
+
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
new file mode 100644
index 000000000000..55c36afed320
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Xaml;
+using Microsoft.Maui.Graphics;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 15196, "Nested Entry View In A Frame Causes Crash", PlatformAffected.Android)]
+	public partial class Issue15196 : ContentPage
+	{
+		public Issue15196()
+		{
+			InitializeComponent();
+		}
+
+		private void Button_Clicked(object sender, EventArgs e)
+		{
+			if (stackLayout.Children.Contains(frame))
+			{
+				// Remove the frame from the stackLayout
+				stackLayout.Children.Remove(frame);
+			}
+
+#if ANDROID
+		frame?.Handler?.DisconnectHandler();
+		entry?.Handler?.DisconnectHandler();
+#endif
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
new file mode 100644
index 000000000000..68fee415cf99
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
@@ -0,0 +1,25 @@
+#if !MACCATALYST
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+    internal class Issue15196 : _IssuesUITest
+	{
+		public override string Issue => "Nested Entry View In A Frame Causes Crash";
+
+		public Issue15196(TestDevice testDevice) : base(testDevice) { }
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[Category(UITestCategories.Frame)]
+		public void CrashShouldNotOccur()
+		{
+			//Validate the crash is fixed
+			App.WaitForElement("RemoveButton");
+			App.Click("RemoveButton");
+		}
+	}
+}
+#endif
\ No newline at end of file

From 5ff6841ba8e492c2fb8ee9f715c6d89f03fd4dd9 Mon Sep 17 00:00:00 2001
From: AhamedAliNishad <ahamedalinishad.j@syncfusion.com>
Date: Tue, 3 Sep 2024 11:57:26 +0530
Subject: [PATCH 2/6] properly fixed the Object disposed exception

---
 .../src/Core/Compatibility/Handlers/Android/FrameRenderer.cs   | 2 +-
 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml    | 2 +-
 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs | 3 +--
 src/Core/src/Handlers/Entry/EntryHandler.Android.cs            | 3 +++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index 70a17fdbb030..bb64e53baf5b 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -131,7 +131,7 @@ protected override void Dispose(bool disposing)
 				{
 					var child = GetChildAt(0);
 					child?.RemoveFromParent();
-					child = null;
+					child?.Dispose();
 				}
 
 				Element?.Handler?.DisconnectHandler();
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
index 138d0807231f..8d57cc5e3619 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
@@ -4,7 +4,7 @@
               x:Class="Maui.Controls.Sample.Issues.Issue15196">
 
   <StackLayout x:Name="stackLayout">
-    <Frame x:Name="frame" AutomationId="FrameWithEntry" HeightRequest="200">
+    <Frame x:Name="frame" HeightRequest="200">
       <Entry x:Name="entry" Text="This is entry inside the frame"/>
     </Frame>
 
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
index 55c36afed320..1fdab050fb14 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
@@ -24,10 +24,9 @@ private void Button_Clicked(object sender, EventArgs e)
 				stackLayout.Children.Remove(frame);
 			}
 
-#if ANDROID
 		frame?.Handler?.DisconnectHandler();
 		entry?.Handler?.DisconnectHandler();
-#endif
+
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index 564c339a7d06..b67b1308eac3 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -52,6 +52,9 @@ protected override void ConnectHandler(AppCompatEditText platformView)
 		// TODO: NET8 issoto - Change the return type to MauiAppCompatEditText
 		protected override void DisconnectHandler(AppCompatEditText platformView)
 		{
+			if (platformView is null || platformView.Handle == IntPtr.Zero)
+				return;
+
 			_clearButtonDrawable = null;
 			platformView.ViewAttachedToWindow -= OnPlatformViewAttachedToWindow;
 			platformView.TextChanged -= OnTextChanged;

From cf1ffe2a50f3016498787277198395621a35b1b1 Mon Sep 17 00:00:00 2001
From: AhamedAliNishad <ahamedalinishad.j@syncfusion.com>
Date: Tue, 3 Sep 2024 12:01:16 +0530
Subject: [PATCH 3/6] Added the proper name of test case

---
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
index 68fee415cf99..80718947b9c3 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
@@ -13,8 +13,7 @@ public Issue15196(TestDevice testDevice) : base(testDevice) { }
 
 		[Test]
 		[Category(UITestCategories.Entry)]
-		[Category(UITestCategories.Frame)]
-		public void CrashShouldNotOccur()
+		public void NestedEntryViewInFrameShouldNotCrash()
 		{
 			//Validate the crash is fixed
 			App.WaitForElement("RemoveButton");

From 2427f101deb85e2da80a5e3cae98214bc5280090 Mon Sep 17 00:00:00 2001
From: AhamedAliNishad <ahamedalinishad.j@syncfusion.com>
Date: Tue, 3 Sep 2024 12:13:23 +0530
Subject: [PATCH 4/6] Removing the unneccesary space

---
 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml    | 2 --
 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
index 8d57cc5e3619..ce8ff2e51eed 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
@@ -7,9 +7,7 @@
     <Frame x:Name="frame" HeightRequest="200">
       <Entry x:Name="entry" Text="This is entry inside the frame"/>
     </Frame>
-
     <Button Text="Remove the frame" AutomationId="RemoveButton" Clicked="Button_Clicked"/>
-
   </StackLayout>
 
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
index 1fdab050fb14..704fe902fb9a 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
@@ -23,10 +23,9 @@ private void Button_Clicked(object sender, EventArgs e)
 				// Remove the frame from the stackLayout
 				stackLayout.Children.Remove(frame);
 			}
-
+			
 		frame?.Handler?.DisconnectHandler();
 		entry?.Handler?.DisconnectHandler();
-
 		}
 	}
 }
\ No newline at end of file

From bb5b615dec07416011a2169ad96d83dc741ee220 Mon Sep 17 00:00:00 2001
From: BagavathiPerumal <bagavathiperumal.a@syncfusion.com>
Date: Tue, 10 Sep 2024 12:21:48 +0530
Subject: [PATCH 5/6] fix-15196-Removed the Dispose method.

---
 .../src/Core/Compatibility/Handlers/Android/FrameRenderer.cs   | 1 -
 src/Core/src/Handlers/Entry/EntryHandler.Android.cs            | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index bb64e53baf5b..c5cdb322314d 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -131,7 +131,6 @@ protected override void Dispose(bool disposing)
 				{
 					var child = GetChildAt(0);
 					child?.RemoveFromParent();
-					child?.Dispose();
 				}
 
 				Element?.Handler?.DisconnectHandler();
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index b67b1308eac3..564c339a7d06 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -52,9 +52,6 @@ protected override void ConnectHandler(AppCompatEditText platformView)
 		// TODO: NET8 issoto - Change the return type to MauiAppCompatEditText
 		protected override void DisconnectHandler(AppCompatEditText platformView)
 		{
-			if (platformView is null || platformView.Handle == IntPtr.Zero)
-				return;
-
 			_clearButtonDrawable = null;
 			platformView.ViewAttachedToWindow -= OnPlatformViewAttachedToWindow;
 			platformView.TextChanged -= OnTextChanged;

From d362f67cd0d61cd0548449fc611599d41bc4b6fe Mon Sep 17 00:00:00 2001
From: BagavathiPerumal <bagavathiperumal.a@syncfusion.com>
Date: Tue, 10 Sep 2024 13:38:35 +0530
Subject: [PATCH 6/6] fix-15196-Modified and removed the changes in test case
 and sample.

---
 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml    | 2 +-
 src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs | 3 +--
 .../tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs    | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
index ce8ff2e51eed..915d6836d2d7 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
@@ -7,7 +7,7 @@
     <Frame x:Name="frame" HeightRequest="200">
       <Entry x:Name="entry" Text="This is entry inside the frame"/>
     </Frame>
-    <Button Text="Remove the frame" AutomationId="RemoveButton" Clicked="Button_Clicked"/>
+    <Button Text="Remove the frame" AutomationId="RemoveButton" Clicked="OnButtonClicked"/>
   </StackLayout>
 
 </ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
index 704fe902fb9a..e6c042faa513 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
@@ -16,11 +16,10 @@ public Issue15196()
 			InitializeComponent();
 		}
 
-		private void Button_Clicked(object sender, EventArgs e)
+		private void OnButtonClicked(object sender, EventArgs e)
 		{
 			if (stackLayout.Children.Contains(frame))
 			{
-				// Remove the frame from the stackLayout
 				stackLayout.Children.Remove(frame);
 			}
 			
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
index 80718947b9c3..ac9ec01ea823 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
@@ -15,7 +15,6 @@ public Issue15196(TestDevice testDevice) : base(testDevice) { }
 		[Category(UITestCategories.Entry)]
 		public void NestedEntryViewInFrameShouldNotCrash()
 		{
-			//Validate the crash is fixed
 			App.WaitForElement("RemoveButton");
 			App.Click("RemoveButton");
 		}