From d625c897ca5d743c207afc15d6c12404a7aa0d6c Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 20 Sep 2017 17:10:17 -0400 Subject: [PATCH] [Mono.Android] Fix AssistStructure.ViewNode enumification Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59625 Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=59532 Bumps to xamarin-android-api-compatibility/master/19a5fbce. The `Android.App.Assist.AssistStructure.ViewNode.AutofillType` and `Android.App.Assist.AssistStructure.ViewNode.InputType` properties had their types swapped. Update `methodmap.csv` so that the appropriate types are used. --- external/xamarin-android-api-compatibility | 2 +- src/Mono.Android/methodmap.csv | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index b26743f1624..19a5fbce76b 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit b26743f16240ae3cdab4d40ce8826c0d4cdfff3f +Subproject commit 19a5fbce76bdae4f198d7da50ae473b5c153d785 diff --git a/src/Mono.Android/methodmap.csv b/src/Mono.Android/methodmap.csv index 43a11eded75..4a22b320eb6 100644 --- a/src/Mono.Android/methodmap.csv +++ b/src/Mono.Android/methodmap.csv @@ -2284,8 +2284,8 @@ 26, android.app.admin, DevicePolicyManager, bindDeviceAdminServiceAsUser, flags, Android.Content.Bind 26, android.app.admin, DevicePolicyManager, resetPasswordWithToken, flags, Android.App.Admin.ResetPasswordFlags 26, android.app.admin, DevicePolicyManager, lockNow, flags, Android.App.Admin.DevicePolicyManagerFlags -26, android.app.assist, AssistStructure.ViewNode, getAutofillType, return, Android.Text.InputTypes -26, android.app.assist, AssistStructure.ViewNode, getInputType, return, Android.Views.AutofillType +26, android.app.assist, AssistStructure.ViewNode, getAutofillType, return, Android.Views.AutofillType +26, android.app.assist, AssistStructure.ViewNode, getInputType, return, Android.Text.InputTypes 26, android.app.job, JobInfo.Builder, setClipData, grantFlags, Android.Content.ActivityFlags 26, android.app.job, JobInfo, getClipGrandFlags, grantFlags, Android.Content.ActivityFlags 26, android.app.job, JobParameters, getClipGrandFlags, grantFlags, Android.Content.ActivityFlags