Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409befaf authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "[API Review] onCreateUnknownConnection" into tm-dev am: febe56da 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033143

Change-Id: I4cf878ea4471ee7c4a047f904a47edec6f94a7b8
parents 56028302 febe56da

core/api/module-lib-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -455,6 +455,14 @@ package android.provider { 


}



package android.telecom {



  public abstract class ConnectionService extends android.app.Service {

    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telecom.Connection onCreateUnknownConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest);

  }



}



package android.telephony {



  public abstract class CellSignalStrength {

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -12225,7 +12225,6 @@ package android.telecom { 














  public abstract class ConnectionService extends android.app.Service {















    method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);













    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telecom.Connection onCreateUnknownConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest);















  }





























  public abstract class InCallService extends android.app.Service {

























telecomm/java/android/telecom/ConnectionService.java



+6
−1




























Original line number
Diff line number
Diff line








@@ -3171,9 +3171,14 @@ public abstract class ConnectionService extends Service {













     *















     * {@link TelecomManager#addNewIncomingCall(PhoneAccountHandle, android.os.Bundle)}.















     *













     * @param connectionManagerPhoneAccount The connection manager account to use for managing













     *                                      this call













     * @param request Details about the outgoing call













     * @return The {@code Connection} object to satisfy this call, or the result of an invocation













     *         of {@link Connection#createFailedConnection(DisconnectCause)} to not handle the call















     * @hide















     */













    @SystemApi













    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)















    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)















    public @Nullable Connection onCreateUnknownConnection(















            @NonNull PhoneAccountHandle connectionManagerPhoneAccount,