Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6f423bfbd4965e4cc27c3e1591ecdef29dcf0c8
This commit is contained in:
Grace Jia
2021-03-11 23:25:32 +00:00
committed by Automerger Merge Worker
parent 695b9ee40e 0251d617a5
commit e4bc4e9ca5
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/api/current.txt
View File

@@ -38399,22 +38399,22 @@ package android.telecom {
method public final void conferenceRemoteConnections(android.telecom.RemoteConnection, android.telecom.RemoteConnection); method public final void conferenceRemoteConnections(android.telecom.RemoteConnection, android.telecom.RemoteConnection);
method public final void connectionServiceFocusReleased(); method public final void connectionServiceFocusReleased();
method @Nullable public final android.telecom.RemoteConference createRemoteIncomingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest); method @Nullable public final android.telecom.RemoteConference createRemoteIncomingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
method public final android.telecom.RemoteConnection createRemoteIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method @Nullable public final android.telecom.RemoteConnection createRemoteIncomingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest);
method @Nullable public final android.telecom.RemoteConference createRemoteOutgoingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest); method @Nullable public final android.telecom.RemoteConference createRemoteOutgoingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
method public final android.telecom.RemoteConnection createRemoteOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method @Nullable public final android.telecom.RemoteConnection createRemoteOutgoingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest);
method public final java.util.Collection<android.telecom.Conference> getAllConferences(); method public final java.util.Collection<android.telecom.Conference> getAllConferences();
method public final java.util.Collection<android.telecom.Connection> getAllConnections(); method public final java.util.Collection<android.telecom.Connection> getAllConnections();
method public final android.os.IBinder onBind(android.content.Intent); method public final android.os.IBinder onBind(android.content.Intent);
method public void onConference(android.telecom.Connection, android.telecom.Connection); method public void onConference(android.telecom.Connection, android.telecom.Connection);
method public void onConnectionServiceFocusGained(); method public void onConnectionServiceFocusGained();
method public void onConnectionServiceFocusLost(); method public void onConnectionServiceFocusLost();
method @Nullable public android.telecom.Conference onCreateIncomingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest); method @Nullable public android.telecom.Conference onCreateIncomingConference(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest);
method public void onCreateIncomingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest); method public void onCreateIncomingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest);
method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
method public void onCreateIncomingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method public void onCreateIncomingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
method public android.telecom.Connection onCreateIncomingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method public android.telecom.Connection onCreateIncomingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
method @Nullable public android.telecom.Conference onCreateOutgoingConference(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest); method @Nullable public android.telecom.Conference onCreateOutgoingConference(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest);
method public void onCreateOutgoingConferenceFailed(@Nullable android.telecom.PhoneAccountHandle, @Nullable android.telecom.ConnectionRequest); method public void onCreateOutgoingConferenceFailed(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest);
method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
method public void onCreateOutgoingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method public void onCreateOutgoingConnectionFailed(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
method public android.telecom.Connection onCreateOutgoingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); method public android.telecom.Connection onCreateOutgoingHandoverConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);

2
telecomm/java/android/telecom/Conference.java
View File

@@ -338,7 +338,7 @@ public abstract class Conference extends Conferenceable {
* *
* @param videoState The video state in which to answer the connection. * @param videoState The video state in which to answer the connection.
*/ */
public void onAnswer(int videoState) {} public void onAnswer(@VideoProfile.VideoState int videoState) {}
/** /**
* Notifies this Conference, which is in {@code STATE_RINGING}, of * Notifies this Conference, which is in {@code STATE_RINGING}, of

36
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -2553,9 +2553,9 @@ public abstract class ConnectionService extends Service {
* @return The {@code Connection} object to satisfy this call, or {@code null} to * @return The {@code Connection} object to satisfy this call, or {@code null} to
* not handle the call. * not handle the call.
*/ */
public final RemoteConnection createRemoteIncomingConnection( public final @Nullable RemoteConnection createRemoteIncomingConnection(
PhoneAccountHandle connectionManagerPhoneAccount, @NonNull PhoneAccountHandle connectionManagerPhoneAccount,
ConnectionRequest request) { @NonNull ConnectionRequest request) {
return mRemoteConnectionManager.createRemoteConnection( return mRemoteConnectionManager.createRemoteConnection(
connectionManagerPhoneAccount, request, true); connectionManagerPhoneAccount, request, true);
} }
@@ -2572,9 +2572,9 @@ public abstract class ConnectionService extends Service {
* @return The {@code Connection} object to satisfy this call, or {@code null} to * @return The {@code Connection} object to satisfy this call, or {@code null} to
* not handle the call. * not handle the call.
*/ */
public final RemoteConnection createRemoteOutgoingConnection( public final @Nullable RemoteConnection createRemoteOutgoingConnection(
PhoneAccountHandle connectionManagerPhoneAccount, @NonNull PhoneAccountHandle connectionManagerPhoneAccount,
ConnectionRequest request) { @NonNull ConnectionRequest request) {
return mRemoteConnectionManager.createRemoteConnection( return mRemoteConnectionManager.createRemoteConnection(
connectionManagerPhoneAccount, request, false); connectionManagerPhoneAccount, request, false);
} }
@@ -2814,12 +2814,14 @@ public abstract class ConnectionService extends Service {
* @param connectionManagerPhoneAccount See description at * @param connectionManagerPhoneAccount See description at
* {@link #onCreateOutgoingConnection(PhoneAccountHandle, ConnectionRequest)}. * {@link #onCreateOutgoingConnection(PhoneAccountHandle, ConnectionRequest)}.
* @param request Details about the incoming conference call. * @param request Details about the incoming conference call.
* @return The {@code Conference} object to satisfy this call, or {@code null} to * @return The {@code Conference} object to satisfy this call. If the conference attempt is
* not handle the call. * failed, the return value will be a result of an invocation of
* {@link Connection#createFailedConnection(DisconnectCause)}.
* Return {@code null} if the {@link ConnectionService} cannot handle the call.
*/ */
public @Nullable Conference onCreateIncomingConference( public @Nullable Conference onCreateIncomingConference(
@Nullable PhoneAccountHandle connectionManagerPhoneAccount, @NonNull PhoneAccountHandle connectionManagerPhoneAccount,
@Nullable ConnectionRequest request) { @NonNull ConnectionRequest request) {
return null; return null;
} }
@@ -2922,8 +2924,8 @@ public abstract class ConnectionService extends Service {
* @param request The outgoing connection request. * @param request The outgoing connection request.
*/ */
public void onCreateOutgoingConferenceFailed( public void onCreateOutgoingConferenceFailed(
@Nullable PhoneAccountHandle connectionManagerPhoneAccount, @NonNull PhoneAccountHandle connectionManagerPhoneAccount,
@Nullable ConnectionRequest request) { @NonNull ConnectionRequest request) {
} }
@@ -2987,12 +2989,14 @@ public abstract class ConnectionService extends Service {
* a {@code PhoneAccount} registered by this {@code ConnectionService} to use for * a {@code PhoneAccount} registered by this {@code ConnectionService} to use for
* making the connection. * making the connection.
* @param request Details about the outgoing call. * @param request Details about the outgoing call.
* @return The {@code Conference} object to satisfy this call, or the result of an invocation * @return The {@code Conference} object to satisfy this call. If the conference attempt is
* of {@link Connection#createFailedConnection(DisconnectCause)} to not handle the call. * failed, the return value will be a result of an invocation of
* {@link Connection#createFailedConnection(DisconnectCause)}.
* Return {@code null} if the {@link ConnectionService} cannot handle the call.
*/ */
public @Nullable Conference onCreateOutgoingConference( public @Nullable Conference onCreateOutgoingConference(
@Nullable PhoneAccountHandle connectionManagerPhoneAccount, @NonNull PhoneAccountHandle connectionManagerPhoneAccount,
@Nullable ConnectionRequest request) { @NonNull ConnectionRequest request) {
return null; return null;
} }