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

Commit 6aac0f52 authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev

parents a759b111 5c6fa95e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -28514,6 +28514,7 @@ package android.telecomm { 
    method protected void onCreateConferenceConnection(java.lang.String, android.telecomm.Connection, android.telecomm.Response<java.lang.String, android.telecomm.Connection>);

    method protected void onCreateIncomingConnection(android.telecomm.ConnectionRequest, android.telecomm.ConnectionService.CreateConnectionResponse<android.telecomm.Connection>);

    method protected void onCreateOutgoingConnection(android.telecomm.ConnectionRequest, android.telecomm.ConnectionService.CreateConnectionResponse<android.telecomm.Connection>);

    field public static final java.lang.String SERVICE_INTERFACE = "android.telecomm.ConnectionService";

  }















  public static abstract interface ConnectionService.CreateConnectionResponse {










@@ -28696,7 +28697,6 @@ package android.telecomm {













    method public android.telecomm.PhoneAccount getPhoneAccount(android.telecomm.PhoneAccountHandle);















    method public void registerPhoneAccount(android.telecomm.PhoneAccount);















    method public void unregisterPhoneAccount(android.telecomm.PhoneAccountHandle);













    field public static final java.lang.String ACTION_CONNECTION_SERVICE;















    field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.intent.action.CONNECTION_SERVICE_CONFIGURE";















    field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','















    field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'

























telecomm/java/android/telecomm/ConnectionService.java



+9
−1




























Original line number
Diff line number
Diff line








@@ -16,10 +16,12 @@





























package android.telecomm;





























import android.annotation.SdkConstant;













import android.annotation.SdkConstant.SdkConstantType;















import android.app.PendingIntent;















import android.app.Service;













import android.content.Intent;















import android.content.ComponentName;













import android.content.Intent;















import android.net.Uri;















import android.os.Bundle;















import android.os.Handler;









@@ -42,6 +44,12 @@ import java.util.Map;













 * Android device.















 */















public abstract class ConnectionService extends Service {













    /**













     * The {@link Intent} that must be declared as handled by the service.













     */













    @SdkConstant(SdkConstantType.SERVICE_ACTION)













    public static final String SERVICE_INTERFACE = "android.telecomm.ConnectionService";





























    // Flag controlling whether PII is emitted into the logs















    private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);















    private static final Connection NULL_CONNECTION = new Connection() {};

































telecomm/java/android/telecomm/TelecommManager.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -48,12 +48,6 @@ public class TelecommManager {













     */















    public static final String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL";





























    /**













     * The service action used to bind to {@link android.telecomm.ConnectionService}













     * implementations.













     */













    public static final String ACTION_CONNECTION_SERVICE = ConnectionService.class.getName();





























    /**















     * The {@link android.content.Intent} action used to configure a















     * {@link android.telecomm.ConnectionService}.