From 41c38c5f05139823dacd931d7d6a68b2e75ff550 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 16 Apr 2025 09:33:53 -1000 Subject: [PATCH] [Mono.Android] Fix API-36 namespace capitalization error from enumification. --- .../PublicAPI/API-36/PublicAPI.Unshipped.txt | 44 +++++++++---------- src/Mono.Android/map.csv | 16 +++---- src/Mono.Android/methodmap.csv | 12 ++--- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/Mono.Android/PublicAPI/API-36/PublicAPI.Unshipped.txt b/src/Mono.Android/PublicAPI/API-36/PublicAPI.Unshipped.txt index 5099ac6004e..871afc24af5 100644 --- a/src/Mono.Android/PublicAPI/API-36/PublicAPI.Unshipped.txt +++ b/src/Mono.Android/PublicAPI/API-36/PublicAPI.Unshipped.txt @@ -1609,9 +1609,9 @@ Android.Ranging.Ble.CS.BleCsRangingCapabilities.DescribeContents() -> int Android.Ranging.Ble.CS.BleCsRangingCapabilities.InterfaceConsts Android.Ranging.Ble.CS.BleCsRangingCapabilities.SupportedSecurityLevels.get -> System.Collections.Generic.ICollection! Android.Ranging.Ble.CS.BleCsRangingCapabilities.WriteToParcel(Android.OS.Parcel! dest, Android.OS.ParcelableWriteFlags flags) -> void -Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel -Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.Four = 4 -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel -Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.One = 1 -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel +Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel +Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.Four = 4 -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel +Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.One = 1 -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel Android.Ranging.Ble.CS.BleCsRangingParams Android.Ranging.Ble.CS.BleCsRangingParams.Builder Android.Ranging.Ble.CS.BleCsRangingParams.Builder.Build() -> Android.Ranging.Ble.CS.BleCsRangingParams! @@ -1622,20 +1622,20 @@ Android.Ranging.Ble.CS.BleCsRangingParams.Builder.SetSecurityLevel(int securityL Android.Ranging.Ble.CS.BleCsRangingParams.Builder.SetSightType(int sightType) -> Android.Ranging.Ble.CS.BleCsRangingParams.Builder! Android.Ranging.Ble.CS.BleCsRangingParams.DescribeContents() -> int Android.Ranging.Ble.CS.BleCsRangingParams.InterfaceConsts -Android.Ranging.Ble.CS.BleCsRangingParams.LocationType.get -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType +Android.Ranging.Ble.CS.BleCsRangingParams.LocationType.get -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType Android.Ranging.Ble.CS.BleCsRangingParams.PeerBluetoothAddress.get -> string! Android.Ranging.Ble.CS.BleCsRangingParams.RangingUpdateRate.get -> Android.Ranging.Raw.RangingDeviceUpdateRate -Android.Ranging.Ble.CS.BleCsRangingParams.SecurityLevel.get -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel -Android.Ranging.Ble.CS.BleCsRangingParams.SightType.get -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType +Android.Ranging.Ble.CS.BleCsRangingParams.SecurityLevel.get -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel +Android.Ranging.Ble.CS.BleCsRangingParams.SightType.get -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType Android.Ranging.Ble.CS.BleCsRangingParams.WriteToParcel(Android.OS.Parcel! dest, Android.OS.ParcelableWriteFlags flags) -> void -Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType -Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Indoor = 1 -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType -Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Outdoor = 2 -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType -Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Unknown = 0 -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType -Android.Ranging.Ble.Cs.BleCsRangingParamsSightType -Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.LineOfSight = 1 -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType -Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.NonLineOfSight = 2 -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType -Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.Unknown = 0 -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType +Android.Ranging.Ble.CS.BleCsRangingParamsLocationType +Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Indoor = 1 -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType +Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Outdoor = 2 -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType +Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Unknown = 0 -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType +Android.Ranging.Ble.CS.BleCsRangingParamsSightType +Android.Ranging.Ble.CS.BleCsRangingParamsSightType.LineOfSight = 1 -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType +Android.Ranging.Ble.CS.BleCsRangingParamsSightType.NonLineOfSight = 2 -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType +Android.Ranging.Ble.CS.BleCsRangingParamsSightType.Unknown = 0 -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType Android.Ranging.Ble.Rssi.BleRssiRangingParams Android.Ranging.Ble.Rssi.BleRssiRangingParams.Builder Android.Ranging.Ble.Rssi.BleRssiRangingParams.Builder.Build() -> Android.Ranging.Ble.Rssi.BleRssiRangingParams! @@ -3194,18 +3194,18 @@ const Android.Provider.Settings.ActionFirstDayOfWeekSettings = "android.settings const Android.Provider.Settings.ActionMeasurementSystemSettings = "android.settings.MEASUREMENT_SYSTEM_SETTINGS" -> string! const Android.Provider.Settings.ActionRegionSettings = "android.settings.REGION_SETTINGS" -> string! const Android.Provider.Settings.ActionTemperatureUnitSettings = "android.settings.TEMPERATURE_UNIT_SETTINGS" -> string! -const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelFour = Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.Four -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel -const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelOne = Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.One -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel +const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelFour = Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.Four -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel +const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelOne = Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.One -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel const Android.Ranging.Ble.CS.BleCsRangingCapabilities.InterfaceConsts.ContentsFileDescriptor = 1 -> int const Android.Ranging.Ble.CS.BleCsRangingCapabilities.InterfaceConsts.ParcelableWriteReturnValue = Android.OS.ParcelableWriteFlags.ReturnValue -> Android.OS.ParcelableWriteFlags const Android.Ranging.Ble.CS.BleCsRangingParams.InterfaceConsts.ContentsFileDescriptor = 1 -> int const Android.Ranging.Ble.CS.BleCsRangingParams.InterfaceConsts.ParcelableWriteReturnValue = Android.OS.ParcelableWriteFlags.ReturnValue -> Android.OS.ParcelableWriteFlags -const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeIndoor = Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Indoor -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType -const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeOutdoor = Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Outdoor -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType -const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeUnknown = Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Unknown -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType -const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeLineOfSight = Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.LineOfSight -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType -const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeNonLineOfSight = Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.NonLineOfSight -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType -const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeUnknown = Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.Unknown -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType +const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeIndoor = Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Indoor -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType +const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeOutdoor = Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Outdoor -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType +const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeUnknown = Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Unknown -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType +const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeLineOfSight = Android.Ranging.Ble.CS.BleCsRangingParamsSightType.LineOfSight -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType +const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeNonLineOfSight = Android.Ranging.Ble.CS.BleCsRangingParamsSightType.NonLineOfSight -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType +const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeUnknown = Android.Ranging.Ble.CS.BleCsRangingParamsSightType.Unknown -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType const Android.Ranging.Ble.Rssi.BleRssiRangingParams.InterfaceConsts.ContentsFileDescriptor = 1 -> int const Android.Ranging.Ble.Rssi.BleRssiRangingParams.InterfaceConsts.ParcelableWriteReturnValue = Android.OS.ParcelableWriteFlags.ReturnValue -> Android.OS.ParcelableWriteFlags const Android.Ranging.DataNotificationConfig.InterfaceConsts.ContentsFileDescriptor = 1 -> int diff --git a/src/Mono.Android/map.csv b/src/Mono.Android/map.csv index db9438902ce..c255870d6d4 100644 --- a/src/Mono.Android/map.csv +++ b/src/Mono.Android/map.csv @@ -12602,14 +12602,14 @@ I,21,android/R$transition.slide_bottom,17760260,,,, I,21,android/R$transition.slide_left,17760263,,,, I,21,android/R$transition.slide_right,17760262,,,, I,21,android/R$transition.slide_top,17760261,,,, -E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_FOUR,4,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel,Four,remove, -E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_ONE,1,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel,One,remove, -E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_INDOOR,1,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType,Indoor,remove, -E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_OUTDOOR,2,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType,Outdoor,remove, -E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_UNKNOWN,0,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType,Unknown,remove, -E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_LINE_OF_SIGHT,1,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType,LineOfSight,remove, -E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_NON_LINE_OF_SIGHT,2,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType,NonLineOfSight,remove, -E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_UNKNOWN,0,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType,Unknown,remove, +E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_FOUR,4,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel,Four,remove, +E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_ONE,1,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel,One,remove, +E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_INDOOR,1,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType,Indoor,remove, +E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_OUTDOOR,2,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType,Outdoor,remove, +E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_UNKNOWN,0,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType,Unknown,remove, +E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_LINE_OF_SIGHT,1,Android.Ranging.Ble.CS.BleCsRangingParamsSightType,LineOfSight,remove, +E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_NON_LINE_OF_SIGHT,2,Android.Ranging.Ble.CS.BleCsRangingParamsSightType,NonLineOfSight,remove, +E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_UNKNOWN,0,Android.Ranging.Ble.CS.BleCsRangingParamsSightType,Unknown,remove, E,36,android/ranging/DataNotificationConfig.NOTIFICATION_CONFIG_DISABLE,0,Android.Ranging.DataNotificationConfigType,Disable,remove, E,36,android/ranging/DataNotificationConfig.NOTIFICATION_CONFIG_ENABLE,1,Android.Ranging.DataNotificationConfigType,Enable,remove, E,36,android/ranging/DataNotificationConfig.NOTIFICATION_CONFIG_PROXIMITY_EDGE,3,Android.Ranging.DataNotificationConfigType,ProximityEdge,remove, diff --git a/src/Mono.Android/methodmap.csv b/src/Mono.Android/methodmap.csv index 13b311d4537..6109e630bb8 100644 --- a/src/Mono.Android/methodmap.csv +++ b/src/Mono.Android/methodmap.csv @@ -4320,15 +4320,15 @@ 36,android.provider,CloudMediaProviderContract$Capabilities,writeToParcel,flags,Android.OS.ParcelableWriteFlags 36,android.provider,ContactsContract$RawContacts$DefaultAccount$DefaultAccountAndState,getState,return,Android.Provider.DefaultAccountState 36,android.ranging.ble.cs,BleCsRangingCapabilities,writeToParcel,flags,Android.OS.ParcelableWriteFlags -36,android.ranging.ble.cs,BleCsRangingParams,getLocationType,return,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType +36,android.ranging.ble.cs,BleCsRangingParams,getLocationType,return,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType 36,android.ranging.ble.cs,BleCsRangingParams,getRangingUpdateRate,return,Android.Ranging.Raw.RangingDeviceUpdateRate -36,android.ranging.ble.cs,BleCsRangingParams,getSecurityLevel,return,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel -36,android.ranging.ble.cs,BleCsRangingParams,getSightType,return,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType +36,android.ranging.ble.cs,BleCsRangingParams,getSecurityLevel,return,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel +36,android.ranging.ble.cs,BleCsRangingParams,getSightType,return,Android.Ranging.Ble.CS.BleCsRangingParamsSightType 36,android.ranging.ble.cs,BleCsRangingParams,writeToParcel,flags,Android.OS.ParcelableWriteFlags -36,android.ranging.ble.cs,BleCsRangingParams$Builder,setLocationType,locationType,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType +36,android.ranging.ble.cs,BleCsRangingParams$Builder,setLocationType,locationType,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType 36,android.ranging.ble.cs,BleCsRangingParams$Builder,setRangingUpdateRate,updateRate,Android.Ranging.Raw.RangingDeviceUpdateRate -36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSecurityLevel,securityLevel,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel -36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSightType,sightType,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType +36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSecurityLevel,securityLevel,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel +36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSightType,sightType,Android.Ranging.Ble.CS.BleCsRangingParamsSightType 36,android.ranging.ble.rssi,BleRssiRangingParams,getRangingUpdateRate,return,Android.Ranging.Raw.RangingDeviceUpdateRate 36,android.ranging.ble.rssi,BleRssiRangingParams,writeToParcel,flags,Android.OS.ParcelableWriteFlags 36,android.ranging.ble.rssi,BleRssiRangingParams$Builder,setRangingUpdateRate,updateRate,Android.Ranging.Raw.RangingDeviceUpdateRate