From fe8c843ef1f60ba3c4e38448ae2fafc171a4f896 Mon Sep 17 00:00:00 2001
From: Isabelle Santin <isabelle@chosenfewsoftware.com>
Date: Sun, 14 Sep 2025 17:45:17 -0500
Subject: [PATCH] Fix: ChoreographerTimer should check for Android version
 correctly. (#19643)

---
 src/Android/Avalonia.Android/ChoreographerTimer.cs            | 2 +-
 .../Platform/SkiaPlatform/AndroidFramebuffer.cs               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Android/Avalonia.Android/ChoreographerTimer.cs b/src/Android/Avalonia.Android/ChoreographerTimer.cs
index ce10f951c3..4d1d1e1c20 100644
--- a/src/Android/Avalonia.Android/ChoreographerTimer.cs
+++ b/src/Android/Avalonia.Android/ChoreographerTimer.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Android
 {
     internal sealed class ChoreographerTimer : IRenderTimer
     {
-        private static readonly bool s_supports64Callback = OperatingSystem.IsAndroidVersionAtLeast(10);
+        private static readonly bool s_supports64Callback = OperatingSystem.IsAndroidVersionAtLeast(29);
         private readonly object _lock = new();
         private readonly TaskCompletionSource<IntPtr> _choreographer = new();
         private readonly AutoResetEvent _event = new(false);
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs
index ef224d6c37..7bfcf92593 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs
@@ -65,12 +65,12 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         internal static extern IntPtr AChoreographer_getInstance();
 
         [DllImport("android")]
-        [UnsupportedOSPlatform("android10.0")]
+        [UnsupportedOSPlatform("android29.0")]
         internal static extern void AChoreographer_postFrameCallback(
             IntPtr choreographer, delegate* unmanaged<int, IntPtr, void> callback, IntPtr data);
 
         [DllImport("android")]
-        [SupportedOSPlatform("android10.0")]
+        [SupportedOSPlatform("android29.0")]
         internal static extern void AChoreographer_postFrameCallback64(
             IntPtr choreographer, delegate* unmanaged<long, IntPtr, void> callback, IntPtr data);