From 643b3335d27a4c463de99f0ee904f82384e53aec Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@xamarin.com>
Date: Wed, 17 Jul 2019 21:56:34 +0200
Subject: [PATCH 1/3] [linker] Make sure we mark *Invoker types

Fixes https://github.com/xamarin/xamarin-android/issues/3263

Looks like
https://github.com/xamarin/xamarin-android/commit/5b945abb2e1f0fe1a9ab6589993c970869c4a752
introduced a new regression, where in some cases we were not marking
the *Invoker type anymore, as [this
line](https://github.com/xamarin/xamarin-android/commit/5b945abb2e1f0fe1a9ab6589993c970869c4a752#diff-144727b152107ec306fbe284bd5902e3L60)
is gone.

This is fixed by marking the *Invoker types in MarkJavaObjects step.
---
 .../Linker/MonoDroid.Tuner/MarkJavaObjects.cs                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs
index 98c4ed3d203..bcc981145a4 100644
--- a/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs
+++ b/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/MarkJavaObjects.cs
@@ -192,6 +192,8 @@ void PreserveInvoker (TypeDefinition type)
 			if (invoker == null)
 				return;
 
+			Annotations.Mark (invoker);
+
 			PreserveIntPtrConstructor (invoker);
 			PreserveInterfaceMethods (type, invoker);
 		}

From 68c85c6a5efeaec69c4ade19802cdc9529690e82 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@xamarin.com>
Date: Thu, 18 Jul 2019 15:10:58 +0200
Subject: [PATCH 2/3] Added test for
 https://github.com/xamarin/xamarin-android/issues/3263

---
 src/Mono.Android/Test/Resources/layout/Main.axml            | 6 ++++++
 .../Test/Xamarin.Android.RuntimeTests/MainActivity.cs       | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/Mono.Android/Test/Resources/layout/Main.axml b/src/Mono.Android/Test/Resources/layout/Main.axml
index 1d5b73ce539..5b279066483 100644
--- a/src/Mono.Android/Test/Resources/layout/Main.axml
+++ b/src/Mono.Android/Test/Resources/layout/Main.axml
@@ -17,6 +17,12 @@
       android:layout_height="wrap_content"
       android:editable="false"
   />
+  <EditText
+      android:id="@+id/edit_text"
+      android:layout_weight="1"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+  />
   <ScrollView
       android:id="@+id/my_scroll_view"
       android:layout_width="fill_parent"
diff --git a/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs b/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs
index cff014745e1..9bfe8087a5d 100644
--- a/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs
+++ b/src/Mono.Android/Test/Xamarin.Android.RuntimeTests/MainActivity.cs
@@ -34,6 +34,9 @@ protected override void OnCreate (Bundle bundle)
 				// ignore
 			};
 
+			// test https://github.com/xamarin/xamarin-android/issues/3263
+			edit_text.TextChanged += delegate { };
+
 			csharp_simple_fragment.AllowEnterTransitionOverlap = true;
 			csharp_partial_assembly.AllowEnterTransitionOverlap = true;
 			csharp_full_assembly.AllowEnterTransitionOverlap = true;

From c665b911036bd103d68cc481d3b62084300b7e59 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@xamarin.com>
Date: Thu, 18 Jul 2019 21:28:54 +0200
Subject: [PATCH 3/3] Add EditText to multidex version of the Mono.Android test
 as well

---
 tests/Runtime-MultiDex/Resources/layout/Main.axml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/Runtime-MultiDex/Resources/layout/Main.axml b/tests/Runtime-MultiDex/Resources/layout/Main.axml
index 1d5b73ce539..5b279066483 100644
--- a/tests/Runtime-MultiDex/Resources/layout/Main.axml
+++ b/tests/Runtime-MultiDex/Resources/layout/Main.axml
@@ -17,6 +17,12 @@
       android:layout_height="wrap_content"
       android:editable="false"
   />
+  <EditText
+      android:id="@+id/edit_text"
+      android:layout_weight="1"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+  />
   <ScrollView
       android:id="@+id/my_scroll_view"
       android:layout_width="fill_parent"