From 96e1e86272430b49ddc908878d3c81096826c26f Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 5 Jun 2024 08:57:47 -0500 Subject: [PATCH 1/2] [api-merge] Update "constant" values if they change between API levels. --- build-tools/api-merge/ApiDescription.cs | 3 +++ .../Profiles/api-VanillaIceCream.xml | 26 +++++++++---------- .../PublicAPI/API-35/PublicAPI.Shipped.txt | 12 ++++----- src/Mono.Android/metadata | 4 +++ 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/build-tools/api-merge/ApiDescription.cs b/build-tools/api-merge/ApiDescription.cs index 5215ec517fd..4e29468e98b 100644 --- a/build-tools/api-merge/ApiDescription.cs +++ b/build-tools/api-merge/ApiDescription.cs @@ -147,6 +147,9 @@ public void Merge (XDocument n, string apiLocation) } */ + // Yes, "constant" values can change between API levels. + smember.SetAttributeValue ("value", nmember.Attribute ("value")?.Value); + UpdateDeprecatedSince (smember, nmember, platform); #if KEEP_OLD_WRONG_COMPATIBILITY diff --git a/src/Mono.Android/Profiles/api-VanillaIceCream.xml b/src/Mono.Android/Profiles/api-VanillaIceCream.xml index 5aafee1fef7..97c8ed6df65 100644 --- a/src/Mono.Android/Profiles/api-VanillaIceCream.xml +++ b/src/Mono.Android/Profiles/api-VanillaIceCream.xml @@ -5835,10 +5835,10 @@ - + - + @@ -22864,7 +22864,7 @@ - + @@ -46711,7 +46711,7 @@ - + @@ -59341,7 +59341,7 @@ - + @@ -77907,11 +77907,11 @@ - + - + @@ -78699,8 +78699,8 @@ - - + + @@ -89000,10 +89000,10 @@ - - - - + + + + diff --git a/src/Mono.Android/PublicAPI/API-35/PublicAPI.Shipped.txt b/src/Mono.Android/PublicAPI/API-35/PublicAPI.Shipped.txt index 74ebaa0a642..1c505c75206 100644 --- a/src/Mono.Android/PublicAPI/API-35/PublicAPI.Shipped.txt +++ b/src/Mono.Android/PublicAPI/API-35/PublicAPI.Shipped.txt @@ -41536,10 +41536,10 @@ const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceEmpty = Androi const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceForeground = Android.App.Importance.Foreground -> Android.App.Importance const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceForegroundService = Android.App.Importance.ForegroundService -> Android.App.Importance const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceGone = Android.App.Importance.Gone -> Android.App.Importance -const Android.App.ActivityManager.RunningAppProcessInfo.ImportancePerceptible = Android.App.Importance.PerceptiblePre26 -> Android.App.Importance +const Android.App.ActivityManager.RunningAppProcessInfo.ImportancePerceptible = Android.App.Importance.Perceptible -> Android.App.Importance const Android.App.ActivityManager.RunningAppProcessInfo.ImportancePerceptiblePre26 = Android.App.Importance.PerceptiblePre26 -> Android.App.Importance const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceService = Android.App.Importance.Service -> Android.App.Importance -const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceTopSleeping = Android.App.Importance.TopSleepingPre28 -> Android.App.Importance +const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceTopSleeping = Android.App.Importance.TopSleeping -> Android.App.Importance const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceTopSleepingPre28 = Android.App.Importance.TopSleepingPre28 -> Android.App.Importance const Android.App.ActivityManager.RunningAppProcessInfo.ImportanceVisible = Android.App.Importance.Visible -> Android.App.Importance const Android.App.ActivityManager.RunningAppProcessInfo.InterfaceConsts.ContentsFileDescriptor = 1 -> int @@ -50303,7 +50303,7 @@ const Android.Net.Http.SslError.SslDateInvalid = Android.Net.Http.SslErrorType.D const Android.Net.Http.SslError.SslExpired = Android.Net.Http.SslErrorType.Expired -> Android.Net.Http.SslErrorType const Android.Net.Http.SslError.SslIdmismatch = Android.Net.Http.SslErrorType.Idmismatch -> Android.Net.Http.SslErrorType const Android.Net.Http.SslError.SslInvalid = Android.Net.Http.SslErrorType.Invalid -> Android.Net.Http.SslErrorType -const Android.Net.Http.SslError.SslMaxError = Android.Net.Http.SslErrorType.DateInvalid -> Android.Net.Http.SslErrorType +const Android.Net.Http.SslError.SslMaxError = Android.Net.Http.SslErrorType.MaxError -> Android.Net.Http.SslErrorType const Android.Net.Http.SslError.SslNotyetvalid = Android.Net.Http.SslErrorType.Notyetvalid -> Android.Net.Http.SslErrorType const Android.Net.Http.SslError.SslUntrusted = Android.Net.Http.SslErrorType.Untrusted -> Android.Net.Http.SslErrorType const Android.Net.Http.UrlRequest.RequestPriorityHighest = Android.Net.Http.UrlRequestPriority.Highest -> Android.Net.Http.UrlRequestPriority @@ -53192,7 +53192,7 @@ const Android.OS.Process.BluetoothUid = 1002 -> int const Android.OS.Process.FirstApplicationUid = 10000 -> int const Android.OS.Process.InvalidPid = -1 -> int const Android.OS.Process.InvalidUid = -1 -> int -const Android.OS.Process.LastApplicationUid = 99999 -> int +const Android.OS.Process.LastApplicationUid = 19999 -> int const Android.OS.Process.PhoneUid = 1001 -> int const Android.OS.Process.RootUid = 0 -> int const Android.OS.Process.ShellUid = 2000 -> int @@ -66217,8 +66217,8 @@ const Android.Util.LayoutDirection.Inherit = Android.Util.LayoutDirections.Inher const Android.Util.LayoutDirection.Locale = Android.Util.LayoutDirections.Locale -> Android.Util.LayoutDirections const Android.Util.LayoutDirection.Ltr = Android.Util.LayoutDirections.Ltr -> Android.Util.LayoutDirections const Android.Util.LayoutDirection.Rtl = Android.Util.LayoutDirections.Rtl -> Android.Util.LayoutDirections -const Android.Util.Patterns.TopLevelDomainStr = "((aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(biz|b[abdefghijmnorstvwyz])|(cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(edu|e[cegrstu])|f[ijkmor]|(gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(info|int|i[delmnoqrst])|(jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(name|net|n[acefgilopruz])|(org|om)|(pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-zckzah)|y[etu]|z[amw])" -> string! -const Android.Util.Patterns.TopLevelDomainStrForWebUrl = "(?:(?:aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(?:biz|b[abdefghijmnorstvwyz])|(?:cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(?:edu|e[cegrstu])|f[ijkmor]|(?:gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(?:info|int|i[delmnoqrst])|(?:jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(?:mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(?:name|net|n[acefgilopruz])|(?:org|om)|(?:pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(?:tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(?:xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-zckzah)|y[etu]|z[amw]))" -> string! +const Android.Util.Patterns.TopLevelDomainStr = "((aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(biz|b[abdefghijmnorstvwyz])|(cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(edu|e[cegrstu])|f[ijkmor]|(gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(info|int|i[delmnoqrst])|(jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(name|net|n[acefgilopruz])|(org|om)|(pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(δοκιμή|испытание|рф|срб|טעסט|آزمایشی|إختبار|الاردن|الجزائر|السعودية|المغرب|امارات|بھارت|تونس|سورية|فلسطين|قطر|مصر|परीक्षा|भारत|ভারত|ਭਾਰਤ|ભારત|இந்தியா|இலங்கை|சிங்கப்பூர்|பரிட்சை|భారత్|ලංකා|ไทย|テスト|中国|中國|台湾|台灣|新加坡|测试|測試|香港|테스트|한국|xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-3e0b707e|xn\\-\\-45brj9c|xn\\-\\-80akhbyknj4f|xn\\-\\-90a3ac|xn\\-\\-9t4b11yi5a|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-deba0ad|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-g6w251d|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-j6w193g|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-s9brj9c|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zckzah|xxx)|y[et]|z[amw])" -> string! +const Android.Util.Patterns.TopLevelDomainStrForWebUrl = "(?:(?:aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(?:biz|b[abdefghijmnorstvwyz])|(?:cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(?:edu|e[cegrstu])|f[ijkmor]|(?:gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(?:info|int|i[delmnoqrst])|(?:jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(?:mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(?:name|net|n[acefgilopruz])|(?:org|om)|(?:pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(?:tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(?:δοκιμή|испытание|рф|срб|טעסט|آزمایشی|إختبار|الاردن|الجزائر|السعودية|المغرب|امارات|بھارت|تونس|سورية|فلسطين|قطر|مصر|परीक्षा|भारत|ভারত|ਭਾਰਤ|ભારત|இந்தியா|இலங்கை|சிங்கப்பூர்|பரிட்சை|భారత్|ලංකා|ไทย|テスト|中国|中國|台湾|台灣|新加坡|测试|測試|香港|테스트|한국|xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-3e0b707e|xn\\-\\-45brj9c|xn\\-\\-80akhbyknj4f|xn\\-\\-90a3ac|xn\\-\\-9t4b11yi5a|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-deba0ad|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-g6w251d|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-j6w193g|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-s9brj9c|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zckzah|xxx)|y[et]|z[amw]))" -> string! const Android.Util.Proto.ProtoOutputStream.FieldCountMask = 16492674416640 -> long const Android.Util.Proto.ProtoOutputStream.FieldCountPacked = 5497558138880 -> long const Android.Util.Proto.ProtoOutputStream.FieldCountRepeated = 2199023255552 -> long diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata index cad12ad38bc..b138b5755e5 100644 --- a/src/Mono.Android/metadata +++ b/src/Mono.Android/metadata @@ -1926,6 +1926,10 @@ OnOpActiveChanged2 OnOpChanged2 + + + + - - + + +