From 64343f5182aaf94fd71c75db08249a8fcc4fb4a7 Mon Sep 17 00:00:00 2001
From: BagavathiPerumal <93652794+BagavathiPerumal@users.noreply.github.com>
Date: Wed, 11 Sep 2024 01:00:10 +0530
Subject: [PATCH] Fix for the Nested Entry View In A Frame Causes Crash 
 (#24543)

* Committed the changes of the issue

* properly fixed the Object disposed exception

* Added the proper name of test case

* Removing the unneccesary space

* fix-15196-Removed the Dispose method.

* fix-15196-Modified and removed the changes in test case and sample.

---------

Co-authored-by: AhamedAliNishad <ahamedalinishad.j@syncfusion.com>
---
 .../Handlers/Android/FrameRenderer.cs         |  1 -
 .../TestCases.HostApp/Issues/Issue15196.xaml  | 13 ++++++++
 .../Issues/Issue15196.xaml.cs                 | 30 +++++++++++++++++++
 .../Tests/Issues/Issue15196.cs                | 23 ++++++++++++++
 4 files changed, 66 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 bb64e53baf..c5cdb32231 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 @@ namespace Microsoft.Maui.Controls.Handlers.Compatibility
 				{
 					var child = GetChildAt(0);
 					child?.RemoveFromParent();
-					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
new file mode 100644
index 0000000000..915d6836d2
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml
@@ -0,0 +1,13 @@
+<?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" HeightRequest="200">
+      <Entry x:Name="entry" Text="This is entry inside the frame"/>
+    </Frame>
+    <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
new file mode 100644
index 0000000000..e6c042faa5
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15196.xaml.cs
@@ -0,0 +1,30 @@
+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 OnButtonClicked(object sender, EventArgs e)
+		{
+			if (stackLayout.Children.Contains(frame))
+			{
+				stackLayout.Children.Remove(frame);
+			}
+			
+		frame?.Handler?.DisconnectHandler();
+		entry?.Handler?.DisconnectHandler();
+		}
+	}
+}
\ 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 0000000000..ac9ec01ea8
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue15196.cs
@@ -0,0 +1,23 @@
+#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)]
+		public void NestedEntryViewInFrameShouldNotCrash()
+		{
+			App.WaitForElement("RemoveButton");
+			App.Click("RemoveButton");
+		}
+	}
+}
+#endif
\ No newline at end of file