Skip to content

Commit

Permalink
[Mono.Android] Fix methods using Android.Telephony.Data.* enums (#6535)
Browse files Browse the repository at this point in the history
Fixes: #6527

Several methods in [`android.telephony.data.ApnSetting`][0] and
[`android.telephony.data.ApnSetting.Builder`][1] have been mapped to
enums that do not exist, such as `Android.Telephony.ApnType`.

These enums are actually in the `Android.Telephony.Data` namespace
and thus should be e.g. `Android.Telephony.Data.ApnType`.

Fixing these enum mappings allows the methods to be bound instead of
being invalidated for trying to reference non-existent types.

Once the enum mapping is corrected, the previously unbound methods
such as [`ApnSetting.Builder.setApnTypeBitmask()`][2] are bound:

![ILDasm output showing `ApnSetting.Builder.SetApnTypeBitmask()`][3]

[0]: https://developer.android.com/reference/android/telephony/data/ApnSetting
[1]: https://developer.android.com/reference/android/telephony/data/ApnSetting.Builder
[2]: https://developer.android.com/reference/android/telephony/data/ApnSetting.Builder#setApnTypeBitmask(int)
[3]: https://user-images.githubusercontent.com/179295/144113897-1de3a5a4-315f-47dc-b1a0-a2d3cd5a0bfd.png "ILDasm output showing `ApnSetting.Builder.SetApnTypeBitmask()`"
  • Loading branch information
jpobst committed Nov 30, 2021
1 parent 38e771b commit c4b02d7
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/Mono.Android/methodmap.csv
Expand Up @@ -2442,18 +2442,18 @@
28, android.telecom, Connection, sendRttInitiationFailure, reason, Android.Telecom.RttSessionModifyResult
28, android.telecom, ConnectionService, onHandoverFailed, error, Android.Telecom.HandoverFailureReason
28, android.telephony, CellInfo, getCellConnectionStatus, return, Android.Telephony.CellConnectionStatus
28, android.telephony.data, ApnSetting, getApnTypeBitmask, return, Android.Telephony.ApnType
28, android.telephony.data, ApnSetting, getAuthType, return, Android.Telephony.AuthType
28, android.telephony.data, ApnSetting, getMvnoType, return, Android.Telephony.MvnoType
28, android.telephony.data, ApnSetting, getApnTypeBitmask, return, Android.Telephony.Data.ApnType
28, android.telephony.data, ApnSetting, getAuthType, return, Android.Telephony.Data.AuthType
28, android.telephony.data, ApnSetting, getMvnoType, return, Android.Telephony.Data.MvnoType
28, android.telephony.data, ApnSetting, getNetworkTypeBitmask, return, Android.Telephony.NetworkType
28, android.telephony.data, ApnSetting, getProtocol, return, Android.Telephony.Protocols
28, android.telephony.data, ApnSetting, getRoamingProtocol, return, Android.Telephony.Protocols
28, android.telephony.data, ApnSetting.Builder, setApnTypeBitmask, apnTypeBitmask, Android.Telephony.ApnType
28, android.telephony.data, ApnSetting.Builder, setAuthType, authType, Android.Telephony.AuthType
28, android.telephony.data, ApnSetting.Builder, setMvnoType, mvnoType, Android.Telephony.MvnoType
28, android.telephony.data, ApnSetting, getProtocol, return, Android.Telephony.Data.Protocols
28, android.telephony.data, ApnSetting, getRoamingProtocol, return, Android.Telephony.Data.Protocols
28, android.telephony.data, ApnSetting.Builder, setApnTypeBitmask, apnTypeBitmask, Android.Telephony.Data.ApnType
28, android.telephony.data, ApnSetting.Builder, setAuthType, authType, Android.Telephony.Data.AuthType
28, android.telephony.data, ApnSetting.Builder, setMvnoType, mvnoType, Android.Telephony.Data.MvnoType
28, android.telephony.data, ApnSetting.Builder, setNetworkTypeBitmask, networkTypeBitmask, Android.Telephony.NetworkType
28, android.telephony.data, ApnSetting.Builder, setProtocol, protocol, Android.Telephony.Protocols
28, android.telephony.data, ApnSetting.Builder, setRoamingProtocol, roamingProtocol, Android.Telephony.Protocols
28, android.telephony.data, ApnSetting.Builder, setProtocol, protocol, Android.Telephony.Data.Protocols
28, android.telephony.data, ApnSetting.Builder, setRoamingProtocol, roamingProtocol, Android.Telephony.Data.Protocols
28, android.telephony, Call.Callback, onHandoverFailed, failureReason, Android.Telephony.HandoverFailureReason
28, android.telephony.mbms, StreamingServiceCallback, onStreamMethodUpdated, methodType, Android.Telephony.StreamingMethod
28, android.telephony.mbms, StreamingServiceCallback, onStreamStateUpdated, state, Android.Telephony.StreamingState
Expand Down

0 comments on commit c4b02d7

Please sign in to comment.