diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rwxr-xr-x | telecomm/java/android/telecom/ConnectionService.java | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 04f907a59535..1047d56059e7 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -42366,6 +42366,8 @@ package android.telecom { method public void onConference(android.telecom.Connection, android.telecom.Connection); method public void onConnectionServiceFocusGained(); method public void onConnectionServiceFocusLost(); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public void onCreateConferenceComplete(@NonNull android.telecom.Conference); + method @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") public void onCreateConnectionComplete(@NonNull android.telecom.Connection); 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 android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 536e458159d1..01448c3bcd9e 100755 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -17,6 +17,7 @@ package android.telecom; import android.annotation.CallbackExecutor; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; @@ -43,6 +44,7 @@ import com.android.internal.os.SomeArgs; import com.android.internal.telecom.IConnectionService; import com.android.internal.telecom.IConnectionServiceAdapter; import com.android.internal.telecom.RemoteServiceCallback; +import com.android.server.telecom.flags.Flags; import java.util.ArrayList; import java.util.Collection; @@ -3235,27 +3237,27 @@ public abstract class ConnectionService extends Service { } /** - * Called after the {@link Connection} returned by + * Called by Telecom after the {@link Connection} returned by * {@link #onCreateIncomingConnection(PhoneAccountHandle, ConnectionRequest)} * or {@link #onCreateOutgoingConnection(PhoneAccountHandle, ConnectionRequest)} has been * added to the {@link ConnectionService} and sent to Telecom. * - * @param connection the {@link Connection}. - * @hide + * @param connection the {@link Connection} which was added to Telecom. */ - public void onCreateConnectionComplete(Connection connection) { + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public void onCreateConnectionComplete(@NonNull Connection connection) { } /** - * Called after the {@link Conference} returned by + * Called by Telecom after the {@link Conference} returned by * {@link #onCreateIncomingConference(PhoneAccountHandle, ConnectionRequest)} * or {@link #onCreateOutgoingConference(PhoneAccountHandle, ConnectionRequest)} has been * added to the {@link ConnectionService} and sent to Telecom. * - * @param conference the {@link Conference}. - * @hide + * @param conference the {@link Conference} which was added to Telecom. */ - public void onCreateConferenceComplete(Conference conference) { + @FlaggedApi(Flags.FLAG_TELECOM_RESOLVE_HIDDEN_DEPENDENCIES) + public void onCreateConferenceComplete(@NonNull Conference conference) { } |