From 3082edb4af0efdd93d3a0c759fd780deb0a49ca4 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Wed, 14 Feb 2018 17:39:21 +0900
Subject: [PATCH] [Mono.Android] abstract-ify inconsistent android.webkit API.

As part of discussion at https://github.com/xamarin/xamarin-android/pull/1078#issuecomment-365187452 ,
we decided to make changes to those inconsistent methods that used to be
virtual and then became abstract, to become abstract even in old API level.

It is done at metadata fixup level.
---
 external/xamarin-android-api-compatibility |  2 +-
 src/Mono.Android/metadata                  | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility
index 9d71e200708..bb8630a22c5 160000
--- a/external/xamarin-android-api-compatibility
+++ b/external/xamarin-android-api-compatibility
@@ -1 +1 @@
-Subproject commit 9d71e2007086737881c8085afd91fc0a5c9a1e6c
+Subproject commit bb8630a22c5106c20acc6eb03d3b68d02426bdda
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index f821925eeef..af3d7f6eab5 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -1,4 +1,17 @@
 <metadata>
+
+  <!-- FIXME: these members used to be `virtual` and then became `abstract`.
+  They result in API breakage (reported as inter-api-level mismatch).
+  This is ancient Google's fault. To deal with the situation nicely,
+  we are marking them just as `abstract` even at the old API Level, so
+  that app developers don't get trapped due to missing members at run time.
+  -->
+  <attr path="/api/package[@name='android.webkit']/class[@name='CookieManager' or @name='WebBackForwardList' or @name='WebHistoryItem' or @name='WebIconDatabase' or @name='WebViewDatabase']/method[@static='false']" name="abstract">true</attr>
+  <attr path="/api/package[@name='android.webkit']/class[@name='WebSettings']/method[@static='false' and @name!='setTextSize']" name="abstract">true</attr>
+  <attr path="/api/package[@name='android.webkit']/class[@name='CookieManager' or @name='WebBackForwardList' or @name='WebHistoryItem' or @name='WebIconDatabase' or @name='WebViewDatabase' or @name='WebSettings']" name="abstract">true</attr>
+  <attr path="/api/package[@name='android.webkit']/class[@name='CookieManager' or @name='WebBackForwardList' or @name='WebHistoryItem' or @name='WebIconDatabase' or @name='WebViewDatabase' or @name='WebSettings']" name="static">false</attr>
+  <attr path="/api/package[@name='android.webkit']/class[@name='CookieManager' or @name='WebBackForwardList' or @name='WebHistoryItem' or @name='WebIconDatabase' or @name='WebViewDatabase' or @name='WebSettings']" name="final">false</attr>
+
   <!-- Manifest.permission has its last name part all in lowercase and
        regarded as obfuscated, so avoid that by explicitly marking not. -->
   <attr path="/api/package[@name='android']/class[@name='Manifest.permission']" name="obfuscated">false</attr>