Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mono.Android] Fix Android.Telecom.InCallService.SetAudioRoute enumification. #7711

Merged
merged 1 commit into from
Jan 18, 2023
Merged

[Mono.Android] Fix Android.Telecom.InCallService.SetAudioRoute enumification. #7711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/Mono.Android/Android.Telecom/InCallService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using Android.Content;

namespace Android.Telecom
{
public abstract partial class InCallService : Android.App.Service
{
#if ANDROID_23
[Obsolete ("Incorrect enum parameter, use the overload that takes a CallAudioRoute paramter instead.")]
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android23.0")]
public void SetAudioRoute ([global::Android.Runtime.GeneratedEnum] Android.Telecom.VideoQuality route)
{
SetAudioRoute ((CallAudioRoute) route);
}
#endif
}
}


1 change: 1 addition & 0 deletions src/Mono.Android/Mono.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
<Compile Include="Android.Icu\DateIntervalFormat.cs" />
<Compile Include="Android.Runtime\DynamicMethodNameCounter.cs" />
<Compile Include="Android.Runtime\IJavaObjectValueMarshaler.cs" />
<Compile Include="Android.Telecom\InCallService.cs" />
</ItemGroup>

<Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
Expand Down
2 changes: 1 addition & 1 deletion src/Mono.Android/methodmap.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,7 +1879,7 @@
23, android.telecom, InCallService.VideoCall.Callback, onCallSessionEvent, event, Android.Telecom.VideoSessionEvent
23, android.telecom, InCallService.VideoCall.Callback, onSessionModifyResponseReceived, status, Android.Telecom.ModifyRequestResult
23, android.telecom, InCallService.VideoCall.Callback, onVideoQualityChanged, videoQuality, Android.Telecom.VideoQuality
23, android.telecom, InCallService, setAudioRoute, route, Android.Telecom.VideoQuality
23, android.telecom, InCallService, setAudioRoute, route, Android.Telecom.CallAudioRoute
23, android.telecom, PhoneAccount, hasCapabilities, capability, Android.Telecom.ConnectionCapability
23, android.telecom, PhoneAccount, getCapabilities, return, Android.Telecom.ConnectionCapability
23, android.telecom, RemoteConference, getConnectionCapabilities, return, Android.Telecom.ConnectionCapability
Expand Down
1 change: 1 addition & 0 deletions tests/api-compatibility/acceptable-breakages-vReference-net8.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3079,3 +3079,4 @@ CannotRemoveAttribute : Attribute 'System.ObsoleteAttribute' exists on 'Org.Apac
CannotRemoveAttribute : Attribute 'System.ObsoleteAttribute' exists on 'Org.Apache.Http.Conn.Ssl.SSLSocketFactory..ctor(Java.Security.KeyStore, System.String)' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'System.ObsoleteAttribute' exists on 'Org.Apache.Http.Conn.Ssl.SSLSocketFactory..ctor(Java.Security.KeyStore, System.String, Java.Security.KeyStore)' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'System.ObsoleteAttribute' exists on 'Org.Apache.Http.Conn.Ssl.SSLSocketFactory.CreateSocket(Java.Net.Socket, System.String, System.Int32, System.Boolean)' in the contract but not the implementation.
CannotRemoveAttribute : Attribute 'Android.Runtime.RegisterAttribute' exists on 'Android.Telecom.InCallService.SetAudioRoute(Android.Telecom.VideoQuality)' in the contract but not the implementation.
1 change: 1 addition & 0 deletions tests/api-compatibility/acceptable-breakages-vReference.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Compat issues with assembly Mono.Android:
CannotRemoveAttribute : Attribute 'Android.Runtime.RegisterAttribute' exists on 'Android.Telecom.InCallService.SetAudioRoute(Android.Telecom.VideoQuality)' in the contract but not the implementation.