From e192af69c18208f02afbbf649368d91dfcdb17d2 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 23 Jan 2024 16:39:27 -0600
Subject: [PATCH] JavaTypeScanner processes all IJavaPeerable implementors

Context: https://github.com/xamarin/xamarin-android/pull/8625#issuecomment-1907027253
---
 src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs b/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs
index 5f965ab46ff..fb9881fc6a8 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/XAJavaTypeScanner.cs
@@ -77,7 +77,7 @@ public List<JavaType> GetJavaTypes (ICollection<ITaskItem> inputAssemblies, XAAs
 
 	void AddJavaType (TypeDefinition type, Dictionary<string, TypeData> types, AndroidTargetArch arch)
 	{
-		if (type.IsSubclassOf ("Java.Lang.Object", cache) || type.IsSubclassOf ("Java.Lang.Throwable", cache) || (type.IsInterface && type.ImplementsInterface ("Java.Interop.IJavaPeerable", cache))) {
+		if (type.ImplementsInterface ("Java.Interop.IJavaPeerable", cache)) {
 			// For subclasses of e.g. Android.App.Activity.
 			string typeName = type.GetPartialAssemblyQualifiedName (cache);
 			if (!types.TryGetValue (typeName, out TypeData typeData)) {