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

Commit ad716ebb authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Add connection properties to Connections." into nyc-dev

parents 0a835f6e 720c6644

api/current.txt

+11 −2
Original line number Diff line number Diff line
@@ -36145,6 +36145,7 @@ package android.telecom { 
    method public final android.telecom.CallAudioState getCallAudioState();

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

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

    method public final long getConnectionTime();

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

    method public final android.telecom.DisconnectCause getDisconnectCause();
@@ -36172,6 +36173,7 @@ package android.telecom { 
    method public final void setActive();

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

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionProperties(int);

    method public final void setConnectionTime(long);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);
@@ -36201,6 +36203,7 @@ package android.telecom { 
    method public final android.telecom.Conference getConference();

    method public final java.util.List<android.telecom.Conferenceable> getConferenceables();

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

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

    method public final android.os.Bundle getExtras();

    method public final int getState();
@@ -36226,6 +36229,7 @@ package android.telecom { 
    method public void onUnhold();

    method public final void putExtras(android.os.Bundle);

    method public final void removeExtras(java.util.List<java.lang.String>);

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

    method public void sendConnectionEvent(java.lang.String, android.os.Bundle);

    method public final void setActive();

    method public final void setAddress(android.net.Uri, int);
@@ -36234,6 +36238,7 @@ package android.telecom { 
    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionProperties(int);

    method public final void setDialing();

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

    method public final deprecated void setExtras(android.os.Bundle);
@@ -36250,12 +36255,11 @@ package android.telecom { 
    method public static java.lang.String stateToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_PULL_CALL = 33554432; // 0x2000000

    field public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_PULL_CALL = 16777216; // 0x1000000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

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

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

    field public static final int CAPABILITY_IS_EXTERNAL_CALL = 16777216; // 0x1000000

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

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

    field public static final int CAPABILITY_MUTE = 64; // 0x40
@@ -36273,6 +36277,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

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

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

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

    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
@@ -36495,6 +36500,7 @@ package android.telecom { 
    method public void disconnect();

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

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

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

    method public android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();
@@ -36517,6 +36523,7 @@ package android.telecom { 
    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List<android.telecom.RemoteConnection>);

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

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

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

    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);
@@ -36535,6 +36542,7 @@ package android.telecom { 
    method public android.telecom.RemoteConference getConference();

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

    method public int getConnectionCapabilities();

    method public int getConnectionProperties();

    method public android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();

    method public int getState();
@@ -36564,6 +36572,7 @@ package android.telecom { 
    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);

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

    method public void onConnectionEvent(android.telecom.RemoteConnection, java.lang.String, android.os.Bundle);

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

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

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

    method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);

api/system-current.txt

+11 −2
Original line number Diff line number Diff line
@@ -38714,6 +38714,7 @@ package android.telecom { 
    method public final java.util.List<android.telecom.Connection> getConferenceableConnections();

    method public final deprecated long getConnectTimeMillis();

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

    method public final long getConnectionTime();

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

    method public final android.telecom.DisconnectCause getDisconnectCause();
@@ -38744,6 +38745,7 @@ package android.telecom { 
    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final deprecated void setConnectTimeMillis(long);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionProperties(int);

    method public final void setConnectionTime(long);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);
@@ -38774,6 +38776,7 @@ package android.telecom { 
    method public final android.telecom.Conference getConference();

    method public final java.util.List<android.telecom.Conferenceable> getConferenceables();

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

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

    method public final android.os.Bundle getExtras();

    method public final int getState();
@@ -38800,6 +38803,7 @@ package android.telecom { 
    method public void onUnhold();

    method public final void putExtras(android.os.Bundle);

    method public final void removeExtras(java.util.List<java.lang.String>);

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

    method public void sendConnectionEvent(java.lang.String, android.os.Bundle);

    method public final void setActive();

    method public final void setAddress(android.net.Uri, int);
@@ -38808,6 +38812,7 @@ package android.telecom { 
    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionProperties(int);

    method public final void setDialing();

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

    method public final deprecated void setExtras(android.os.Bundle);
@@ -38824,12 +38829,11 @@ package android.telecom { 
    method public static java.lang.String stateToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_PULL_CALL = 33554432; // 0x2000000

    field public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_PULL_CALL = 16777216; // 0x1000000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

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

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

    field public static final int CAPABILITY_IS_EXTERNAL_CALL = 16777216; // 0x1000000

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

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

    field public static final int CAPABILITY_MUTE = 64; // 0x40
@@ -38847,6 +38851,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

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

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

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

    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
@@ -39124,6 +39129,7 @@ package android.telecom { 
    method public void disconnect();

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

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

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

    method public android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();
@@ -39147,6 +39153,7 @@ package android.telecom { 
    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List<android.telecom.RemoteConnection>);

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

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

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

    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);
@@ -39165,6 +39172,7 @@ package android.telecom { 
    method public android.telecom.RemoteConference getConference();

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

    method public int getConnectionCapabilities();

    method public int getConnectionProperties();

    method public android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();

    method public int getState();
@@ -39195,6 +39203,7 @@ package android.telecom { 
    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);

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

    method public void onConnectionEvent(android.telecom.RemoteConnection, java.lang.String, android.os.Bundle);

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

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

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

    method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);

api/test-current.txt

+11 −2
Original line number Diff line number Diff line
@@ -36216,6 +36216,7 @@ package android.telecom { 
    method public final android.telecom.CallAudioState getCallAudioState();

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

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

    method public final long getConnectionTime();

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

    method public final android.telecom.DisconnectCause getDisconnectCause();
@@ -36243,6 +36244,7 @@ package android.telecom { 
    method public final void setActive();

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

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionProperties(int);

    method public final void setConnectionTime(long);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);
@@ -36272,6 +36274,7 @@ package android.telecom { 
    method public final android.telecom.Conference getConference();

    method public final java.util.List<android.telecom.Conferenceable> getConferenceables();

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

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

    method public final android.os.Bundle getExtras();

    method public final int getState();
@@ -36297,6 +36300,7 @@ package android.telecom { 
    method public void onUnhold();

    method public final void putExtras(android.os.Bundle);

    method public final void removeExtras(java.util.List<java.lang.String>);

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

    method public void sendConnectionEvent(java.lang.String, android.os.Bundle);

    method public final void setActive();

    method public final void setAddress(android.net.Uri, int);
@@ -36305,6 +36309,7 @@ package android.telecom { 
    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionProperties(int);

    method public final void setDialing();

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

    method public final deprecated void setExtras(android.os.Bundle);
@@ -36321,12 +36326,11 @@ package android.telecom { 
    method public static java.lang.String stateToString(int);

    field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000

    field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000

    field public static final int CAPABILITY_CAN_PULL_CALL = 33554432; // 0x2000000

    field public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 4194304; // 0x400000

    field public static final int CAPABILITY_CAN_PULL_CALL = 16777216; // 0x1000000

    field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000

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

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

    field public static final int CAPABILITY_IS_EXTERNAL_CALL = 16777216; // 0x1000000

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

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

    field public static final int CAPABILITY_MUTE = 64; // 0x40
@@ -36344,6 +36348,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

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

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

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

    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
@@ -36566,6 +36571,7 @@ package android.telecom { 
    method public void disconnect();

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

    method public final int getConnectionCapabilities();

    method public final int getConnectionProperties();

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

    method public android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();
@@ -36588,6 +36594,7 @@ package android.telecom { 
    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List<android.telecom.RemoteConnection>);

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

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

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

    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);
@@ -36606,6 +36613,7 @@ package android.telecom { 
    method public android.telecom.RemoteConference getConference();

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

    method public int getConnectionCapabilities();

    method public int getConnectionProperties();

    method public android.telecom.DisconnectCause getDisconnectCause();

    method public final android.os.Bundle getExtras();

    method public int getState();
@@ -36635,6 +36643,7 @@ package android.telecom { 
    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);

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

    method public void onConnectionEvent(android.telecom.RemoteConnection, java.lang.String, android.os.Bundle);

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

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

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

    method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);

telecomm/java/android/telecom/Call.java

+4 −4
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public final class Call { 
         * in its manifest.

         * <p>

         * See {@link Connection#CAPABILITY_CAN_PULL_CALL} and

         * {@link Connection#CAPABILITY_IS_EXTERNAL_CALL}.

         * {@link Connection#PROPERTY_IS_EXTERNAL_CALL}.

         */

        public static final int CAPABILITY_CAN_PULL_CALL = 0x00800000;
@@ -296,13 +296,13 @@ public final class Call { 
         * Consider, for example, a scenario where a user has two phones with the same phone number.

         * When a user places a call on one device, the telephony stack can represent that call on

         * the other device by adding it to the {@link ConnectionService} with the

         * {@link Connection#CAPABILITY_IS_EXTERNAL_CALL} capability set.

         * {@link Connection#PROPERTY_IS_EXTERNAL_CALL} property set.

         * <p>

         * An {@link InCallService} will only see calls with this property if it has the

         * {@link TelecomManager#METADATA_INCLUDE_EXTERNAL_CALLS} metadata set to {@code true}

         * in its manifest.

         * <p>

         * See {@link Connection#CAPABILITY_IS_EXTERNAL_CALL}.

         * See {@link Connection#PROPERTY_IS_EXTERNAL_CALL}.

         */

        public static final int PROPERTY_IS_EXTERNAL_CALL = 0x00000040;
@@ -686,7 +686,7 @@ public final class Call { 
            sb.append(", caps: ");

            sb.append(capabilitiesToString(mCallCapabilities));

            sb.append(", props: ");

            sb.append(mCallProperties);

            sb.append(propertiesToString(mCallProperties));

            sb.append("]");

            return sb.toString();

        }

telecomm/java/android/telecom/Conference.java

+30 −1
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ public abstract class Conference extends Conferenceable { 
        public void onDestroyed(Conference conference) {}

        public void onConnectionCapabilitiesChanged(

                Conference conference, int connectionCapabilities) {}

        public void onConnectionPropertiesChanged(

                Conference conference, int connectionProperties) {}

        public void onVideoStateChanged(Conference c, int videoState) { }

        public void onVideoProviderChanged(Conference c, Connection.VideoProvider videoProvider) {}

        public void onStatusHintsChanged(Conference conference, StatusHints statusHints) {}
@@ -74,6 +76,7 @@ public abstract class Conference extends Conferenceable { 
    private int mState = Connection.STATE_NEW;

    private DisconnectCause mDisconnectCause;

    private int mConnectionCapabilities;

    private int mConnectionProperties;

    private String mDisconnectMessage;

    private long mConnectTimeMillis = CONNECT_TIME_NOT_SPECIFIED;

    private StatusHints mStatusHints;
@@ -155,6 +158,16 @@ public abstract class Conference extends Conferenceable { 
        return mConnectionCapabilities;

    }



    /**

     * Returns the properties of the conference. See {@code PROPERTY_*} constants in class

     * {@link Connection} for valid values.

     *

     * @return A bitmask of the properties of the conference call.

     */

    public final int getConnectionProperties() {

        return mConnectionProperties;

    }



    /**

     * Whether the given capabilities support the specified capability.

     *
@@ -364,7 +377,7 @@ public abstract class Conference extends Conferenceable { 
     * Sets the capabilities of a conference. See {@code CAPABILITY_*} constants of class

     * {@link Connection} for valid values.

     *

     * @param connectionCapabilities A bitmask of the {@code PhoneCapabilities} of the conference call.

     * @param connectionCapabilities A bitmask of the {@code Capabilities} of the conference call.

     */

    public final void setConnectionCapabilities(int connectionCapabilities) {

        if (connectionCapabilities != mConnectionCapabilities) {
@@ -376,6 +389,22 @@ public abstract class Conference extends Conferenceable { 
        }

    }



    /**

     * Sets the properties of a conference. See {@code PROPERTY_*} constants of class

     * {@link Connection} for valid values.

     *

     * @param connectionProperties A bitmask of the {@code Properties} of the conference call.

     */

    public final void setConnectionProperties(int connectionProperties) {

        if (connectionProperties != mConnectionProperties) {

            mConnectionProperties = connectionProperties;



            for (Listener l : mListeners) {

                l.onConnectionPropertiesChanged(this, mConnectionProperties);

            }

        }

    }



    /**

     * Adds the specified connection as a child of this conference.

     *