From 4135c83a09626856a3965683ef677000004ccb6c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Sep 2026 02:02:40 +0000
Subject: [PATCH 1/2] Remove stale AIDL byte FIXMEs

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs b/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs
index 1401668affd..fbb89f21655 100644
--- a/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs
+++ b/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs
@@ -121,6 +121,7 @@ public string ToFullJavaName (TypeName javaType)
 			}
 		}
 
+
 		TextWriter w;
 		BindingDatabase database;
 
@@ -427,7 +428,6 @@ string GetCreateStatements (TypeName type, string parcel, string arg)
 				return String.Format ("{0} = {1}.ReadInt () != 0;", arg, parcel);
 			case "bool []":
 				return String.Format ("{0} = {1}.CreateBooleanArray ();", arg, parcel);
-			// FIXME: I'm not sure if aidl should support byte...
 			case "sbyte":
 				return String.Format ("{0} = {1}.ReadByte ();", arg, parcel);
 			case "byte []":
@@ -501,7 +501,6 @@ string GetReadStatements (TypeName type, string parcel, string arg)
 				return String.Format ("{1}.ReadStringArray ({0});", arg, parcel);
 			case "bool []":
 				return String.Format ("{1}.ReadBooleanArray ({0});", arg, parcel);
-			// FIXME: I'm not sure if aidl should support byte...
 			case "byte []":
 				return String.Format ("{1}.ReadByteArray ({0});", arg, parcel);
 			case "char []":
@@ -565,7 +564,6 @@ string GetWriteStatements (TypeName type, string parcel, string arg, string parc
 				return parcel + ".WriteInt (" + arg + " ? 1 : 0);";
 			case "bool []":
 				return parcel + ".WriteBooleanArray (" + arg + ");";
-			// FIXME: I'm not sure if aidl should support byte...
 			case "sbyte":
 				return parcel + ".WriteByte (" + arg + ");";
 			case "byte []":
@@ -683,4 +681,3 @@ string JoinArguments (Method m)
 		}
 	}
 }
-

From c52408c2df5f2fdd7c41f270e51227a6fcf0c5d6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Sep 2026 02:02:42 +0000
Subject: [PATCH 2/2] Preserve AIDL generator whitespace

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs b/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs
index fbb89f21655..b9fb4a6e8e3 100644
--- a/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs
+++ b/src/Xamarin.Android.Tools.Aidl/CSharpCodeGenerator.cs
@@ -121,7 +121,6 @@ public string ToFullJavaName (TypeName javaType)
 			}
 		}
 
-
 		TextWriter w;
 		BindingDatabase database;