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

Commit 157bd0e3 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev 

* commit 'fa5456e5455d215fa73a504d78a8f152d8cd1b05':
  @hide ConnectionService APIs.
parents 8d843cea 79355e03

api/current.txt

+0 −312
Original line number Original line Diff line number Diff line
@@ -28050,328 +28050,16 @@ package android.system { 
















package android.telecom {







package android.telecom {



























  public final class AudioState implements android.os.Parcelable {














    ctor public AudioState(boolean, int, int);














    ctor public AudioState(android.telecom.AudioState);














    method public int describeContents();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final android.os.Parcelable.Creator CREATOR;














    field public static final int ROUTE_BLUETOOTH = 2; // 0x2














    field public static final int ROUTE_EARPIECE = 1; // 0x1














    field public static final int ROUTE_SPEAKER = 8; // 0x8














    field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4














    field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5














    field public final boolean isMuted;














    field public final int route;














    field public final int supportedRouteMask;














  }



























  public abstract class Conference {














    ctor public Conference(android.telecom.PhoneAccountHandle);














    method public final boolean addConnection(android.telecom.Connection);














    method public final void destroy();














    method public final android.telecom.AudioState getAudioState();














    method public final int getCapabilities();














    method public final java.util.List<android.telecom.Connection> getConnections();














    method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();














    method public final int getState();














    method public void onAudioStateChanged(android.telecom.AudioState);














    method public void onDisconnect();














    method public void onHold();














    method public void onMerge();














    method public void onPlayDtmfTone(char);














    method public void onSeparate(android.telecom.Connection);














    method public void onStopDtmfTone();














    method public void onSwap();














    method public void onUnhold();














    method public final void removeConnection(android.telecom.Connection);














    method public final void setActive();














    method public final void setCapabilities(int);














    method public final void setDisconnected(android.telecom.DisconnectCause);














    method public final void setOnHold();














  }



























  public abstract class Connection {














    ctor public Connection();














    method public static android.telecom.Connection createCanceledConnection();














    method public static android.telecom.Connection createFailedConnection(android.telecom.DisconnectCause);














    method public final void destroy();














    method public final android.net.Uri getAddress();














    method public final int getAddressPresentation();














    method public final boolean getAudioModeIsVoip();














    method public final android.telecom.AudioState getAudioState();














    method public final int getCallCapabilities();














    method public final java.lang.String getCallerDisplayName();














    method public final int getCallerDisplayNamePresentation();














    method public final android.telecom.Conference getConference();














    method public final java.util.List<android.telecom.Connection> getConferenceableConnections();














    method public final android.telecom.DisconnectCause getDisconnectCause();














    method public final int getState();














    method public final android.telecom.StatusHints getStatusHints();














    method public final boolean isRingbackRequested();














    method public void onAbort();














    method public void onAnswer();














    method public void onAudioStateChanged(android.telecom.AudioState);














    method public void onConferenceWith(android.telecom.Connection);














    method public void onDisconnect();














    method public void onHold();














    method public void onPlayDtmfTone(char);














    method public void onPostDialContinue(boolean);














    method public void onReject();














    method public void onSeparate();














    method public void onStateChanged(int);














    method public void onStopDtmfTone();














    method public void onUnhold();














    method public final void setActive();














    method public final void setAddress(android.net.Uri, int);














    method public final void setAudioModeIsVoip(boolean);














    method public final void setCallCapabilities(int);














    method public final void setCallerDisplayName(java.lang.String, int);














    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);














    method public final void setConnectionService(android.telecom.ConnectionService);














    method public final void setDialing();














    method public final void setDisconnected(android.telecom.DisconnectCause);














    method public final void setInitialized();














    method public final void setInitializing();














    method public final void setOnHold();














    method public final void setPostDialWait(java.lang.String);














    method public final void setRingbackRequested(boolean);














    method public final void setRinging();














    method public final void setStatusHints(android.telecom.StatusHints);














    method public static java.lang.String stateToString(int);














    field public static final int STATE_ACTIVE = 4; // 0x4














    field public static final int STATE_DIALING = 3; // 0x3














    field public static final int STATE_DISCONNECTED = 6; // 0x6














    field public static final int STATE_HOLDING = 5; // 0x5














    field public static final int STATE_INITIALIZING = 0; // 0x0














    field public static final int STATE_NEW = 1; // 0x1














    field public static final int STATE_RINGING = 2; // 0x2














  }



























  public final class ConnectionRequest implements android.os.Parcelable {














    ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle);














    method public int describeContents();














    method public android.telecom.PhoneAccountHandle getAccountHandle();














    method public android.net.Uri getAddress();














    method public android.os.Bundle getExtras();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final android.os.Parcelable.Creator CREATOR;














  }



























  public abstract class ConnectionService extends android.app.Service {














    ctor public ConnectionService();














    method public final void addConference(android.telecom.Conference);














    method public final void conferenceRemoteConnections(android.telecom.RemoteConnection, android.telecom.RemoteConnection);














    method public final android.telecom.RemoteConnection createRemoteIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);














    method public final android.telecom.RemoteConnection createRemoteOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);














    method public final java.util.Collection<android.telecom.Connection> getAllConnections();














    method public final android.os.IBinder onBind(android.content.Intent);














    method public void onConference(android.telecom.Connection, android.telecom.Connection);














    method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);














    method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);














    method public void onRemoteConferenceAdded(android.telecom.RemoteConference);














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














  }



























  public final class DisconnectCause implements android.os.Parcelable {














    ctor public DisconnectCause(int);














    ctor public DisconnectCause(int, java.lang.String);














    ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String);














    ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String, int);














    method public int describeContents();














    method public int getCode();














    method public java.lang.CharSequence getDescription();














    method public java.lang.CharSequence getLabel();














    method public java.lang.String getReason();














    method public int getTone();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final int BUSY = 7; // 0x7














    field public static final int CANCELED = 4; // 0x4














    field public static final android.os.Parcelable.Creator CREATOR;














    field public static final int ERROR = 1; // 0x1














    field public static final int LOCAL = 2; // 0x2














    field public static final int MISSED = 5; // 0x5














    field public static final int OTHER = 9; // 0x9














    field public static final int REJECTED = 6; // 0x6














    field public static final int REMOTE = 3; // 0x3














    field public static final int RESTRICTED = 8; // 0x8














    field public static final int UNKNOWN = 0; // 0x0














  }



























  public class GatewayInfo implements android.os.Parcelable {














    method public int describeContents();














    method public android.net.Uri getGatewayAddress();














    method public java.lang.String getGatewayProviderPackageName();














    method public android.net.Uri getOriginalAddress();














    method public boolean isEmpty();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final android.os.Parcelable.Creator CREATOR;














  }



























  public class PhoneAccount implements android.os.Parcelable {














    method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);














    method public int describeContents();














    method public android.telecom.PhoneAccountHandle getAccountHandle();














    method public android.net.Uri getAddress();














    method public int getCapabilities();














    method public android.graphics.drawable.Drawable getIcon(android.content.Context);














    method public int getIconResId();














    method public java.lang.CharSequence getLabel();














    method public java.lang.CharSequence getShortDescription();














    method public android.net.Uri getSubscriptionAddress();














    method public java.util.List<java.lang.String> getSupportedUriSchemes();














    method public boolean hasCapabilities(int);














    method public boolean supportsUriScheme(java.lang.String);














    method public void writeToParcel(android.os.Parcel, int);














    field public static final int CAPABILITY_CONNECTION_MANAGER = 1; // 0x1














    field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10














    field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4














    field public static final android.os.Parcelable.Creator CREATOR;














    field public static final java.lang.String SCHEME_SIP = "sip";














    field public static final java.lang.String SCHEME_TEL = "tel";














    field public static final java.lang.String SCHEME_VOICEMAIL = "voicemail";














  }



























  public static class PhoneAccount.Builder {














    ctor public PhoneAccount.Builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);














    ctor public PhoneAccount.Builder(android.telecom.PhoneAccount);














    method public android.telecom.PhoneAccount build();














    method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);














    method public android.telecom.PhoneAccount.Builder setCapabilities(int);














    method public android.telecom.PhoneAccount.Builder setIconResId(int);














    method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence);














    method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri);














    method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);














  }



























  public class PhoneAccountHandle implements android.os.Parcelable {














    ctor public PhoneAccountHandle(android.content.ComponentName, java.lang.String);














    method public int describeContents();














    method public android.content.ComponentName getComponentName();














    method public java.lang.String getId();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final android.os.Parcelable.Creator CREATOR;














  }



























  public final class PhoneCapabilities {














    method public static java.lang.String toString(int);














    field public static final int ADD_CALL = 16; // 0x10














    field public static final int ALL = 12543; // 0x30ff














    field public static final int DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000














    field public static final int HOLD = 1; // 0x1














    field public static final int MANAGE_CONFERENCE = 128; // 0x80














    field public static final int MERGE_CONFERENCE = 4; // 0x4














    field public static final int MUTE = 64; // 0x40














    field public static final int RESPOND_VIA_TEXT = 32; // 0x20














    field public static final int SEPARATE_FROM_CONFERENCE = 4096; // 0x1000














    field public static final int SUPPORT_HOLD = 2; // 0x2














    field public static final int SWAP_CONFERENCE = 8; // 0x8














  }



























  public final class RemoteConference {














    method public void disconnect();














    method public final int getCallCapabilities();














    method public final java.util.List<android.telecom.RemoteConnection> getConnections();














    method public android.telecom.DisconnectCause getDisconnectCause();














    method public final int getState();














    method public void hold();














    method public void playDtmfTone(char);














    method public final void registerCallback(android.telecom.RemoteConference.Callback);














    method public void separate(android.telecom.RemoteConnection);














    method public void setAudioState(android.telecom.AudioState);














    method public void stopDtmfTone();














    method public void unhold();














    method public final void unregisterCallback(android.telecom.RemoteConference.Callback);














  }



























  public static abstract class RemoteConference.Callback {














    ctor public RemoteConference.Callback();














    method public void onCapabilitiesChanged(android.telecom.RemoteConference, int);














    method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection);














    method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);














    method public void onDestroyed(android.telecom.RemoteConference);














    method public void onDisconnected(android.telecom.RemoteConference, android.telecom.DisconnectCause);














    method public void onStateChanged(android.telecom.RemoteConference, int, int);














  }



























  public final class RemoteConnection {














    method public void abort();














    method public void answer();














    method public void disconnect();














    method public android.net.Uri getAddress();














    method public int getAddressPresentation();














    method public int getCallCapabilities();














    method public java.lang.CharSequence getCallerDisplayName();














    method public int getCallerDisplayNamePresentation();














    method public android.telecom.RemoteConference getConference();














    method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();














    method public android.telecom.DisconnectCause getDisconnectCause();














    method public int getState();














    method public android.telecom.StatusHints getStatusHints();














    method public void hold();














    method public boolean isRingbackRequested();














    method public boolean isVoipAudioMode();














    method public void playDtmfTone(char);














    method public void postDialContinue(boolean);














    method public void registerCallback(android.telecom.RemoteConnection.Callback);














    method public void reject();














    method public void setAudioState(android.telecom.AudioState);














    method public void stopDtmfTone();














    method public void unhold();














    method public void unregisterCallback(android.telecom.RemoteConnection.Callback);














  }



























  public static abstract class RemoteConnection.Callback {














    ctor public RemoteConnection.Callback();














    method public void onAddressChanged(android.telecom.RemoteConnection, android.net.Uri, int);














    method public void onCallCapabilitiesChanged(android.telecom.RemoteConnection, int);














    method public void onCallerDisplayNameChanged(android.telecom.RemoteConnection, java.lang.String, int);














    method public void onConferenceChanged(android.telecom.RemoteConnection, android.telecom.RemoteConference);














    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);














    method public void onDestroyed(android.telecom.RemoteConnection);














    method public void onDisconnected(android.telecom.RemoteConnection, android.telecom.DisconnectCause);














    method public void onPostDialWait(android.telecom.RemoteConnection, java.lang.String);














    method public void onRingbackRequested(android.telecom.RemoteConnection, boolean);














    method public void onStateChanged(android.telecom.RemoteConnection, int);














    method public void onStatusHintsChanged(android.telecom.RemoteConnection, android.telecom.StatusHints);














    method public void onVoipAudioChanged(android.telecom.RemoteConnection, boolean);














  }



























  public final class StatusHints implements android.os.Parcelable {














    ctor public StatusHints(android.content.ComponentName, java.lang.CharSequence, int, android.os.Bundle);














    method public int describeContents();














    method public android.os.Bundle getExtras();














    method public android.graphics.drawable.Drawable getIcon(android.content.Context);














    method public int getIconResId();














    method public java.lang.CharSequence getLabel();














    method public android.content.ComponentName getPackageName();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final android.os.Parcelable.Creator CREATOR;














  }



























  public class TelecomManager {







  public class TelecomManager {











    method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);














    method public void cancelMissedCallsNotification();







    method public void cancelMissedCallsNotification();











    method public void clearAccounts();














    method public android.telecom.PhoneAccountHandle getConnectionManager();














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














    method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsForPackage();














    method public boolean handleMmi(java.lang.String);







    method public boolean handleMmi(java.lang.String);











    method public boolean hasMultipleCallCapableAccounts();














    method public boolean isInCall();







    method public boolean isInCall();











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














    method public void showInCallScreen(boolean);







    method public void showInCallScreen(boolean);











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














    field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";














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














    field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";







    field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";











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







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











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







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











    field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";














    field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";







    field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";











    field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";







    field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";











    field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";














    field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";














    field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";







    field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";











    field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";







    field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";











    field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";







    field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";

























telecomm/java/android/telecom/AudioState.java



+3
−0




























Original line number
Original line
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.telecom;







package android.telecom;


































import android.annotation.SystemApi;











import android.os.Parcel;







import android.os.Parcel;











import android.os.Parcelable;







import android.os.Parcelable;





























@@ -23,7 +24,9 @@ import java.util.Locale;





























/**







/**











 *  Encapsulates all audio states during a call.







 *  Encapsulates all audio states during a call.














 *  @hide











 */







 */














@SystemApi











public final class AudioState implements Parcelable {







public final class AudioState implements Parcelable {











    /** Direct the audio stream through the device's earpiece. */







    /** Direct the audio stream through the device's earpiece. */











    public static final int ROUTE_EARPIECE      = 0x00000001;







    public static final int ROUTE_EARPIECE      = 0x00000001;

































telecomm/java/android/telecom/Conference.java



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -16,6 +16,8 @@





























package android.telecom;







package android.telecom;


































import android.annotation.SystemApi;


























import java.util.Collections;







import java.util.Collections;











import java.util.List;







import java.util.List;











import java.util.Set;







import java.util.Set;









@@ -24,7 +26,9 @@ import java.util.concurrent.CopyOnWriteArraySet;





























/**







/**











 * Represents a conference call which can contain any number of {@link Connection} objects.







 * Represents a conference call which can contain any number of {@link Connection} objects.














 * @hide











 */







 */














@SystemApi











public abstract class Conference {







public abstract class Conference {































    /** @hide */







    /** @hide */

































telecomm/java/android/telecom/Connection.java



+4
−1




























Original line number
Original line
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.telecom;









import com.android.internal.telecom.IVideoCallback;







import com.android.internal.telecom.IVideoCallback;











import com.android.internal.telecom.IVideoProvider;







import com.android.internal.telecom.IVideoProvider;


































import android.annotation.SystemApi;











import android.net.Uri;







import android.net.Uri;











import android.os.Handler;







import android.os.Handler;











import android.os.IBinder;







import android.os.IBinder;









@@ -43,7 +44,9 @@ import java.util.concurrent.ConcurrentHashMap;









 * Implementations are then responsible for updating the state of the {@code Connection}, and







 * Implementations are then responsible for updating the state of the {@code Connection}, and











 * must call {@link #destroy()} to signal to the framework that the {@code Connection} is no







 * must call {@link #destroy()} to signal to the framework that the {@code Connection} is no











 * longer used and associated resources may be recovered.







 * longer used and associated resources may be recovered.














 * @hide











 */







 */














@SystemApi











public abstract class Connection {







public abstract class Connection {































    public static final int STATE_INITIALIZING = 0;







    public static final int STATE_INITIALIZING = 0;










@@ -873,7 +876,7 @@ public abstract class Connection {









        return mUnmodifiableConferenceableConnections;







        return mUnmodifiableConferenceableConnections;











    }







    }































    /*







    /**











     * @hide







     * @hide











     */







     */











    public final void setConnectionService(ConnectionService connectionService) {







    public final void setConnectionService(ConnectionService connectionService) {

































telecomm/java/android/telecom/ConnectionRequest.java



+3
−0




























Original line number
Original line
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.telecom;







package android.telecom;


































import android.annotation.SystemApi;











import android.net.Uri;







import android.net.Uri;











import android.os.Bundle;







import android.os.Bundle;











import android.os.Parcel;







import android.os.Parcel;









@@ -24,7 +25,9 @@ import android.os.Parcelable;









/**







/**











 * Simple data container encapsulating a request to some entity to







 * Simple data container encapsulating a request to some entity to











 * create a new {@link Connection}.







 * create a new {@link Connection}.














 * @hide











 */







 */














@SystemApi











public final class ConnectionRequest implements Parcelable {







public final class ConnectionRequest implements Parcelable {































    // TODO: Token to limit recursive invocations







    // TODO: Token to limit recursive invocations