Skip to content

Commit ffcd805

Browse files
jpobstjonpryor
authored andcommitted
[Mono.Android] Fix API-36 namespace capitalization error (#10046)
Context: #9914 Context: d5152b6 Context: #10045 In #9914 / d5152b6, we completed enumification of Android API-36 and marked it as stable. A bug in this is that we were not consistent with our capitalization of the `Android.Ranging.Ble.CS` namespace: Methods were placed in the `Android.Ranging.Ble.CS` namespace but enums were placed in the `Android.Ranging.Ble.Cs` namespace. Fix the following enums to have the correct "CS" namespace: * Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel * Android.Ranging.Ble.CS.BleCsRangingParamsLocationType * Android.Ranging.Ble.CS.BleCsRangingParamsSightType
1 parent eb7a6a6 commit ffcd805

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

src/Mono.Android/PublicAPI/API-36/PublicAPI.Unshipped.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,9 +1609,9 @@ Android.Ranging.Ble.CS.BleCsRangingCapabilities.DescribeContents() -> int
16091609
Android.Ranging.Ble.CS.BleCsRangingCapabilities.InterfaceConsts
16101610
Android.Ranging.Ble.CS.BleCsRangingCapabilities.SupportedSecurityLevels.get -> System.Collections.Generic.ICollection<Java.Lang.Integer!>!
16111611
Android.Ranging.Ble.CS.BleCsRangingCapabilities.WriteToParcel(Android.OS.Parcel! dest, Android.OS.ParcelableWriteFlags flags) -> void
1612-
Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
1613-
Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.Four = 4 -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
1614-
Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.One = 1 -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
1612+
Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
1613+
Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.Four = 4 -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
1614+
Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.One = 1 -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
16151615
Android.Ranging.Ble.CS.BleCsRangingParams
16161616
Android.Ranging.Ble.CS.BleCsRangingParams.Builder
16171617
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
16221622
Android.Ranging.Ble.CS.BleCsRangingParams.Builder.SetSightType(int sightType) -> Android.Ranging.Ble.CS.BleCsRangingParams.Builder!
16231623
Android.Ranging.Ble.CS.BleCsRangingParams.DescribeContents() -> int
16241624
Android.Ranging.Ble.CS.BleCsRangingParams.InterfaceConsts
1625-
Android.Ranging.Ble.CS.BleCsRangingParams.LocationType.get -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
1625+
Android.Ranging.Ble.CS.BleCsRangingParams.LocationType.get -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
16261626
Android.Ranging.Ble.CS.BleCsRangingParams.PeerBluetoothAddress.get -> string!
16271627
Android.Ranging.Ble.CS.BleCsRangingParams.RangingUpdateRate.get -> Android.Ranging.Raw.RangingDeviceUpdateRate
1628-
Android.Ranging.Ble.CS.BleCsRangingParams.SecurityLevel.get -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
1629-
Android.Ranging.Ble.CS.BleCsRangingParams.SightType.get -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
1628+
Android.Ranging.Ble.CS.BleCsRangingParams.SecurityLevel.get -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
1629+
Android.Ranging.Ble.CS.BleCsRangingParams.SightType.get -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType
16301630
Android.Ranging.Ble.CS.BleCsRangingParams.WriteToParcel(Android.OS.Parcel! dest, Android.OS.ParcelableWriteFlags flags) -> void
1631-
Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
1632-
Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Indoor = 1 -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
1633-
Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Outdoor = 2 -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
1634-
Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Unknown = 0 -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
1635-
Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
1636-
Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.LineOfSight = 1 -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
1637-
Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.NonLineOfSight = 2 -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
1638-
Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.Unknown = 0 -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
1631+
Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
1632+
Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Indoor = 1 -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
1633+
Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Outdoor = 2 -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
1634+
Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Unknown = 0 -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
1635+
Android.Ranging.Ble.CS.BleCsRangingParamsSightType
1636+
Android.Ranging.Ble.CS.BleCsRangingParamsSightType.LineOfSight = 1 -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType
1637+
Android.Ranging.Ble.CS.BleCsRangingParamsSightType.NonLineOfSight = 2 -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType
1638+
Android.Ranging.Ble.CS.BleCsRangingParamsSightType.Unknown = 0 -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType
16391639
Android.Ranging.Ble.Rssi.BleRssiRangingParams
16401640
Android.Ranging.Ble.Rssi.BleRssiRangingParams.Builder
16411641
Android.Ranging.Ble.Rssi.BleRssiRangingParams.Builder.Build() -> Android.Ranging.Ble.Rssi.BleRssiRangingParams!
@@ -3194,18 +3194,18 @@ const Android.Provider.Settings.ActionFirstDayOfWeekSettings = "android.settings
31943194
const Android.Provider.Settings.ActionMeasurementSystemSettings = "android.settings.MEASUREMENT_SYSTEM_SETTINGS" -> string!
31953195
const Android.Provider.Settings.ActionRegionSettings = "android.settings.REGION_SETTINGS" -> string!
31963196
const Android.Provider.Settings.ActionTemperatureUnitSettings = "android.settings.TEMPERATURE_UNIT_SETTINGS" -> string!
3197-
const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelFour = Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.Four -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
3198-
const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelOne = Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel.One -> Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
3197+
const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelFour = Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.Four -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
3198+
const Android.Ranging.Ble.CS.BleCsRangingCapabilities.CsSecurityLevelOne = Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel.One -> Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
31993199
const Android.Ranging.Ble.CS.BleCsRangingCapabilities.InterfaceConsts.ContentsFileDescriptor = 1 -> int
32003200
const Android.Ranging.Ble.CS.BleCsRangingCapabilities.InterfaceConsts.ParcelableWriteReturnValue = Android.OS.ParcelableWriteFlags.ReturnValue -> Android.OS.ParcelableWriteFlags
32013201
const Android.Ranging.Ble.CS.BleCsRangingParams.InterfaceConsts.ContentsFileDescriptor = 1 -> int
32023202
const Android.Ranging.Ble.CS.BleCsRangingParams.InterfaceConsts.ParcelableWriteReturnValue = Android.OS.ParcelableWriteFlags.ReturnValue -> Android.OS.ParcelableWriteFlags
3203-
const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeIndoor = Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Indoor -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
3204-
const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeOutdoor = Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Outdoor -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
3205-
const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeUnknown = Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType.Unknown -> Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
3206-
const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeLineOfSight = Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.LineOfSight -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
3207-
const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeNonLineOfSight = Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.NonLineOfSight -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
3208-
const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeUnknown = Android.Ranging.Ble.Cs.BleCsRangingParamsSightType.Unknown -> Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
3203+
const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeIndoor = Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Indoor -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
3204+
const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeOutdoor = Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Outdoor -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
3205+
const Android.Ranging.Ble.CS.BleCsRangingParams.LocationTypeUnknown = Android.Ranging.Ble.CS.BleCsRangingParamsLocationType.Unknown -> Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
3206+
const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeLineOfSight = Android.Ranging.Ble.CS.BleCsRangingParamsSightType.LineOfSight -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType
3207+
const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeNonLineOfSight = Android.Ranging.Ble.CS.BleCsRangingParamsSightType.NonLineOfSight -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType
3208+
const Android.Ranging.Ble.CS.BleCsRangingParams.SightTypeUnknown = Android.Ranging.Ble.CS.BleCsRangingParamsSightType.Unknown -> Android.Ranging.Ble.CS.BleCsRangingParamsSightType
32093209
const Android.Ranging.Ble.Rssi.BleRssiRangingParams.InterfaceConsts.ContentsFileDescriptor = 1 -> int
32103210
const Android.Ranging.Ble.Rssi.BleRssiRangingParams.InterfaceConsts.ParcelableWriteReturnValue = Android.OS.ParcelableWriteFlags.ReturnValue -> Android.OS.ParcelableWriteFlags
32113211
const Android.Ranging.DataNotificationConfig.InterfaceConsts.ContentsFileDescriptor = 1 -> int

src/Mono.Android/map.csv

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12602,14 +12602,14 @@ I,21,android/R$transition.slide_bottom,17760260,,,,
1260212602
I,21,android/R$transition.slide_left,17760263,,,,
1260312603
I,21,android/R$transition.slide_right,17760262,,,,
1260412604
I,21,android/R$transition.slide_top,17760261,,,,
12605-
E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_FOUR,4,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel,Four,remove,
12606-
E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_ONE,1,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel,One,remove,
12607-
E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_INDOOR,1,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType,Indoor,remove,
12608-
E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_OUTDOOR,2,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType,Outdoor,remove,
12609-
E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_UNKNOWN,0,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType,Unknown,remove,
12610-
E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_LINE_OF_SIGHT,1,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType,LineOfSight,remove,
12611-
E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_NON_LINE_OF_SIGHT,2,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType,NonLineOfSight,remove,
12612-
E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_UNKNOWN,0,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType,Unknown,remove,
12605+
E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_FOUR,4,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel,Four,remove,
12606+
E,36,android/ranging/ble/cs/BleCsRangingCapabilities.CS_SECURITY_LEVEL_ONE,1,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel,One,remove,
12607+
E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_INDOOR,1,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType,Indoor,remove,
12608+
E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_OUTDOOR,2,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType,Outdoor,remove,
12609+
E,36,android/ranging/ble/cs/BleCsRangingParams.LOCATION_TYPE_UNKNOWN,0,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType,Unknown,remove,
12610+
E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_LINE_OF_SIGHT,1,Android.Ranging.Ble.CS.BleCsRangingParamsSightType,LineOfSight,remove,
12611+
E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_NON_LINE_OF_SIGHT,2,Android.Ranging.Ble.CS.BleCsRangingParamsSightType,NonLineOfSight,remove,
12612+
E,36,android/ranging/ble/cs/BleCsRangingParams.SIGHT_TYPE_UNKNOWN,0,Android.Ranging.Ble.CS.BleCsRangingParamsSightType,Unknown,remove,
1261312613
E,36,android/ranging/DataNotificationConfig.NOTIFICATION_CONFIG_DISABLE,0,Android.Ranging.DataNotificationConfigType,Disable,remove,
1261412614
E,36,android/ranging/DataNotificationConfig.NOTIFICATION_CONFIG_ENABLE,1,Android.Ranging.DataNotificationConfigType,Enable,remove,
1261512615
E,36,android/ranging/DataNotificationConfig.NOTIFICATION_CONFIG_PROXIMITY_EDGE,3,Android.Ranging.DataNotificationConfigType,ProximityEdge,remove,

src/Mono.Android/methodmap.csv

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4320,15 +4320,15 @@
43204320
36,android.provider,CloudMediaProviderContract$Capabilities,writeToParcel,flags,Android.OS.ParcelableWriteFlags
43214321
36,android.provider,ContactsContract$RawContacts$DefaultAccount$DefaultAccountAndState,getState,return,Android.Provider.DefaultAccountState
43224322
36,android.ranging.ble.cs,BleCsRangingCapabilities,writeToParcel,flags,Android.OS.ParcelableWriteFlags
4323-
36,android.ranging.ble.cs,BleCsRangingParams,getLocationType,return,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
4323+
36,android.ranging.ble.cs,BleCsRangingParams,getLocationType,return,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
43244324
36,android.ranging.ble.cs,BleCsRangingParams,getRangingUpdateRate,return,Android.Ranging.Raw.RangingDeviceUpdateRate
4325-
36,android.ranging.ble.cs,BleCsRangingParams,getSecurityLevel,return,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
4326-
36,android.ranging.ble.cs,BleCsRangingParams,getSightType,return,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
4325+
36,android.ranging.ble.cs,BleCsRangingParams,getSecurityLevel,return,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
4326+
36,android.ranging.ble.cs,BleCsRangingParams,getSightType,return,Android.Ranging.Ble.CS.BleCsRangingParamsSightType
43274327
36,android.ranging.ble.cs,BleCsRangingParams,writeToParcel,flags,Android.OS.ParcelableWriteFlags
4328-
36,android.ranging.ble.cs,BleCsRangingParams$Builder,setLocationType,locationType,Android.Ranging.Ble.Cs.BleCsRangingParamsLocationType
4328+
36,android.ranging.ble.cs,BleCsRangingParams$Builder,setLocationType,locationType,Android.Ranging.Ble.CS.BleCsRangingParamsLocationType
43294329
36,android.ranging.ble.cs,BleCsRangingParams$Builder,setRangingUpdateRate,updateRate,Android.Ranging.Raw.RangingDeviceUpdateRate
4330-
36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSecurityLevel,securityLevel,Android.Ranging.Ble.Cs.BleCsRangingCapabilitiesCsSecurityLevel
4331-
36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSightType,sightType,Android.Ranging.Ble.Cs.BleCsRangingParamsSightType
4330+
36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSecurityLevel,securityLevel,Android.Ranging.Ble.CS.BleCsRangingCapabilitiesCsSecurityLevel
4331+
36,android.ranging.ble.cs,BleCsRangingParams$Builder,setSightType,sightType,Android.Ranging.Ble.CS.BleCsRangingParamsSightType
43324332
36,android.ranging.ble.rssi,BleRssiRangingParams,getRangingUpdateRate,return,Android.Ranging.Raw.RangingDeviceUpdateRate
43334333
36,android.ranging.ble.rssi,BleRssiRangingParams,writeToParcel,flags,Android.OS.ParcelableWriteFlags
43344334
36,android.ranging.ble.rssi,BleRssiRangingParams$Builder,setRangingUpdateRate,updateRate,Android.Ranging.Raw.RangingDeviceUpdateRate

0 commit comments

Comments
 (0)