From 66415dbad084369be324e9e6946a88d39e0d23bb Mon Sep 17 00:00:00 2001
From: kerams <kerams@users.noreply.github.com>
Date: Wed, 15 Apr 2026 11:38:20 +0200
Subject: [PATCH] Holder RemoveCallback (#21176)

---
 .../Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index 3cdda52764..c2ebd83e97 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -38,6 +38,9 @@ namespace Avalonia.Android
 
         protected override void Dispose(bool disposing)
         {
+            if (disposing)
+                Holder?.RemoveCallback(this);
+
             ReleaseNativeWindowHandle();
             base.Dispose(disposing);
         }